diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index f5c7f017..69c7274a 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -39,6 +39,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) # endif union @@ -60,6 +64,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_vec2.hpp b/glm/detail/type_vec2.hpp index a9af32e3..b8b8f32e 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) # 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 f85f0a5c..28e6c6ed 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) # 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 5e89b744..0a16bc2c 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) # 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/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 8af1c8bf..ff8c4aa6 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -49,6 +49,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) # endif union @@ -57,6 +61,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 -- 2.15.1.windows.2