Christophe Riccio 11 years ago
parent
commit
30e7eaeb86
1 changed files with 5 additions and 21 deletions
  1. 5 21
      glm/detail/type_vec4.hpp

+ 5 - 21
glm/detail/type_vec4.hpp

@@ -112,27 +112,11 @@ namespace detail
 #				endif//GLM_SWIZZLE
 #				endif//GLM_SWIZZLE
 			};
 			};
 #		else
 #		else
-/*
-#			if GLM_HAS_UNRESTRICTED_UNIONS
-				union
-				{
-					typename detail::simd<T>::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
 #			ifdef GLM_SWIZZLE
 				GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, tvec4, tvec2, tvec3, tvec4)
 				GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, tvec4, tvec2, tvec3, tvec4)
 #			endif//GLM_SWIZZLE
 #			endif//GLM_SWIZZLE