diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 4534bbed..178868c5 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -109,13 +109,13 @@ namespace glm GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<2, U, P> const& v); // -- Swizzle constructors -- -# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED template GLM_FUNC_DECL vec(detail::_swizzle<2, T, Q, E0, E1,-1,-2> const& that) { *this = that(); } -# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED // -- Unary arithmetic operators -- diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index ff561146..26627138 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -127,7 +127,7 @@ namespace glm GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<3, U, P> const& v); // -- Swizzle constructors -- -# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED template GLM_FUNC_DECL vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that) { @@ -145,7 +145,7 @@ namespace glm { *this = vec(scalar, v()); } -# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED // -- Unary arithmetic operators -- diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 518f00d5..7633bd16 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -178,7 +178,7 @@ namespace glm GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<4, U, P> const& v); // -- Swizzle constructors -- -# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED template GLM_FUNC_DECL vec(detail::_swizzle<4, T, Q, E0, E1, E2, E3> const& that) { @@ -220,7 +220,7 @@ namespace glm { *this = vec<4, T, Q>(x, v()); } -# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED) +# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED // -- Unary arithmetic operators -- diff --git a/glm/ext/vec1.hpp b/glm/ext/vec1.hpp index bc056cc3..d2e792c7 100644 --- a/glm/ext/vec1.hpp +++ b/glm/ext/vec1.hpp @@ -113,13 +113,13 @@ namespace glm // -- Swizzle constructors -- /* -# if(GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)) +# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED template GLM_FUNC_DECL tvec(detail::_swizzle<1, T, Q, tvec1, E0, -1,-2,-3> const& that) { *this = that(); } -# endif//(GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)) +# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED */ // -- Unary arithmetic operators --