From fb24a1aeafc45512086c1615cee1a78142582b15 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 2 Jun 2018 03:32:28 +0200 Subject: [PATCH] Suppressed VC warnings with /permissive- --- glm/detail/type_vec2.hpp | 7 +++++++ glm/detail/type_vec3.hpp | 7 +++++++ glm/detail/type_vec4.hpp | 7 +++++++ glm/ext/vec1.hpp | 7 +++++++ glm/gtc/quaternion.hpp | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index b6ab6853..6dfa3300 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -38,6 +38,10 @@ namespace glm # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wnested-anon-types" +# endif +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(push) +# pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union # endif union @@ -60,6 +64,9 @@ namespace glm }; +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(pop) +# endif # if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop # endif diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 506e8a36..024a27d0 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -38,6 +38,10 @@ namespace glm # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wnested-anon-types" +# endif +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(push) +# pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union # endif union @@ -59,6 +63,9 @@ namespace glm # endif//GLM_SWIZZLE }; +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(pop) +# endif # if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop # endif diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 43395ca4..e099e5ef 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -38,6 +38,10 @@ namespace glm # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wnested-anon-types" +# endif +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(push) +# pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union # endif union @@ -61,6 +65,9 @@ namespace glm # endif//GLM_SWIZZLE }; +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(pop) +# endif # if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop # endif diff --git a/glm/ext/vec1.hpp b/glm/ext/vec1.hpp index 887877e5..62a8d22e 100644 --- a/glm/ext/vec1.hpp +++ b/glm/ext/vec1.hpp @@ -55,6 +55,10 @@ namespace glm # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wnested-anon-types" +# endif +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(push) +# pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union # endif union @@ -76,6 +80,9 @@ namespace glm # endif//GLM_SWIZZLE*/ }; +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(pop) +# endif # if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop # endif diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 25f741cc..7aa5a8b0 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -48,6 +48,10 @@ namespace glm # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wnested-anon-types" +# endif +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(push) +# pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union # endif union @@ -56,6 +60,9 @@ namespace glm typename detail::storage::value>::type data; }; +# if GLM_COMPILER & GLM_COMPILER_VC +# pragma warning(pop) +# endif # if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop # endif