Ignore VC C4201 warnings.

This commit is contained in:
JF 2016-12-08 10:40:00 +01:00
parent 85bd36806c
commit fdd362656c
5 changed files with 43 additions and 8 deletions

View File

@ -37,7 +37,11 @@ namespace glm
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types" # pragma clang diagnostic ignored "-Wnested-anon-types"
# endif # endif
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable: 4201)
# endif
union union
{ {
T x; T x;
@ -56,7 +60,10 @@ namespace glm
_GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, s) _GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, s)
# endif//GLM_SWIZZLE*/ # endif//GLM_SWIZZLE*/
}; };
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG # if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop # pragma clang diagnostic pop
# endif # endif

View File

@ -36,7 +36,11 @@ namespace glm
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types" # pragma clang diagnostic ignored "-Wnested-anon-types"
# endif # endif
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable: 4201)
# endif
union union
{ {
struct{ T x, y; }; struct{ T x, y; };
@ -56,7 +60,10 @@ namespace glm
# endif//GLM_SWIZZLE # endif//GLM_SWIZZLE
}; };
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG # if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop # pragma clang diagnostic pop
# endif # endif

View File

@ -35,6 +35,10 @@ namespace glm
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types" # pragma clang diagnostic ignored "-Wnested-anon-types"
# endif
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable: 4201)
# endif # endif
union union
@ -55,7 +59,10 @@ namespace glm
_GLM_SWIZZLE3_4_MEMBERS(T, P, glm::tvec4, s, t, p) _GLM_SWIZZLE3_4_MEMBERS(T, P, glm::tvec4, s, t, p)
# endif//GLM_SWIZZLE # endif//GLM_SWIZZLE
}; };
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG # if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop # pragma clang diagnostic pop
# endif # endif

View File

@ -36,7 +36,11 @@ namespace glm
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types" # pragma clang diagnostic ignored "-Wnested-anon-types"
# endif # endif
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable: 4201)
# endif
union union
{ {
struct { T x, y, z, w;}; struct { T x, y, z, w;};
@ -58,6 +62,9 @@ namespace glm
# endif//GLM_SWIZZLE # endif//GLM_SWIZZLE
}; };
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG # if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop # pragma clang diagnostic pop
# endif # endif

View File

@ -49,13 +49,20 @@ namespace glm
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct" # pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types" # pragma clang diagnostic ignored "-Wnested-anon-types"
# endif # endif
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable: 4201)
# endif
union union
{ {
struct { T x, y, z, w;}; struct { T x, y, z, w;};
typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data; typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data;
}; };
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG # if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop # pragma clang diagnostic pop
# endif # endif