From 30e7eaeb86bbd8c9e7287aecf0892610bc669c28 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 15 Nov 2014 21:37:59 +0100 Subject: [PATCH] Clean up --- glm/detail/type_vec4.hpp | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 18fda9ae..05689ece 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -112,27 +112,11 @@ namespace detail # endif//GLM_SWIZZLE }; # else -/* -# if GLM_HAS_UNRESTRICTED_UNIONS - union - { - typename detail::simd::type data; - struct - { - union { T x, r, s; }; - union { T y, g, t; }; - union { T z, b, p; }; - union { T w, a, q; }; - }; - }; -# else -*/ - union { T x, r, s; }; - union { T y, g, t; }; - union { T z, b, p; }; - union { T w, a, q; }; -//s# endif - + union { T x, r, s; }; + union { T y, g, t; }; + union { T z, b, p; }; + union { T w, a, q; }; + # ifdef GLM_SWIZZLE GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, tvec4, tvec2, tvec3, tvec4) # endif//GLM_SWIZZLE