diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-25 14:12:05 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-25 14:12:05 -0500 |
| commit | 34d992d75ea2b7f7c663dab6731ae819c4c54001 (patch) | |
| tree | f29ae8162c01ec5cf3629cfd64a6502102acacd3 /include/glm | |
| parent | f15968207ae17734f8caf623e9be7cc51994aee8 (diff) | |
modified glm; added pedantic flag
Diffstat (limited to 'include/glm')
| -rw-r--r-- | include/glm/detail/setup.hpp | 10 | ||||
| -rw-r--r-- | include/glm/detail/type_vec2.hpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/glm/detail/setup.hpp b/include/glm/detail/setup.hpp index dbd81c1..0b40e4f 100644 --- a/include/glm/detail/setup.hpp +++ b/include/glm/detail/setup.hpp @@ -426,17 +426,17 @@ #define GLM_NOT_BUGGY_VC32BITS (!(GLM_MODEL == GLM_MODEL_32 && (GLM_COMPILER & GLM_COMPILER_VC) && GLM_COMPILER < GLM_COMPILER_VC2013)) -#if GLM_COMPILER & GLM_COMPILER_LLVM +/*#if GLM_COMPILER & GLM_COMPILER_LLVM # define GLM_HAS_UNRESTRICTED_UNIONS __has_feature(cxx_unrestricted_unions) -#elif GLM_LANG & (GLM_LANG_CXX11_FLAG | GLM_LANG_CXXMS_FLAG) -# define GLM_HAS_UNRESTRICTED_UNIONS 1 -#else +#elif GLM_LANG & (GLM_LANG_CXX11_FLAG | GLM_LANG_CXXMS_FLAG)*/ +# define GLM_HAS_UNRESTRICTED_UNIONS 0 // 1 +/*#else # define GLM_HAS_UNRESTRICTED_UNIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_LANG & GLM_LANG_CXXMS_FLAG)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)) || \ ((GLM_COMPILER & GLM_COMPILER_CUDA) && (GLM_COMPILER >= GLM_COMPILER_CUDA75)) || \ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46))) -#endif +#endif*/ // N2346 #if GLM_COMPILER & GLM_COMPILER_LLVM diff --git a/include/glm/detail/type_vec2.hpp b/include/glm/detail/type_vec2.hpp index 6dc2fd4..1ce30ea 100644 --- a/include/glm/detail/type_vec2.hpp +++ b/include/glm/detail/type_vec2.hpp @@ -55,7 +55,7 @@ namespace glm // -- Data -- -# if GLM_HAS_UNRESTRICTED_UNIONS +/*# if GLM_HAS_UNRESTRICTED_UNIONS union { struct{ T x, y; }; @@ -74,14 +74,14 @@ namespace glm _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, s, t) # endif//GLM_SWIZZLE }; -# else +# else*/ union {T x, r, s;}; union {T y, g, t;}; # ifdef GLM_SWIZZLE GLM_SWIZZLE_GEN_VEC_FROM_VEC2(T, P, tvec2, tvec2, tvec3, tvec4) # endif//GLM_SWIZZLE -# endif +//# endif // -- Component accesses -- |