diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 97ada0b7..90901bee 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -64,7 +64,7 @@ namespace glm template GLM_FUNC_QUALIFIER tvec4::tvec4() -# ifndef GLM_FORCE_NO_CTOR_INIT +# ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0), z(0), w(0) # endif {} @@ -72,36 +72,19 @@ namespace glm #if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) template <> GLM_FUNC_QUALIFIER tvec4::tvec4() -# ifndef GLM_FORCE_NO_CTOR_INIT +# ifndef GLM_FORCE_NO_CTOR_INIT : data(_mm_setzero_ps()) # endif {} template <> GLM_FUNC_QUALIFIER tvec4::tvec4() -# ifndef GLM_FORCE_NO_CTOR_INIT +# ifndef GLM_FORCE_NO_CTOR_INIT : data(_mm_setzero_ps()) # endif {} #endif -/* - template - GLM_FUNC_QUALIFIER tvec4::tvec4(tvec4 const & v) - : x(v.x), y(v.y), z(v.z), w(v.w) - {} -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(tvec4 const & v) - : data(v.data) - {} - - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(tvec4 const & v) - : data(v.data) - {} -#endif -*/ template template GLM_FUNC_QUALIFIER tvec4::tvec4(tvec4 const & v) @@ -134,7 +117,7 @@ namespace glm template GLM_FUNC_QUALIFIER tvec4::tvec4(T const & a, T const & b, T const & c, T const & d) - : x(a), y(b), z(c), w(d) + : x(a), y(b), z(c), w(d) {} #if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)