Browse Source

Fixed build

Christophe Riccio 9 years ago
parent
commit
f5ab820ffe
2 changed files with 5 additions and 2 deletions
  1. 0 1
      glm/detail/type_vec.hpp
  2. 5 1
      test/bug/bug_ms_vec_static.cpp

+ 0 - 1
glm/detail/type_vec.hpp

@@ -102,7 +102,6 @@ namespace detail
 }//namespace detail
 
 #if GLM_HAS_TEMPLATE_ALIASES
-	template <length_t L, typename T, precision P = defaultp> struct vec;
 	template <typename T, precision P = defaultp> using tvec1 = vec<1, T, P>;
 	template <typename T, precision P = defaultp> using tvec2 = vec<2, T, P>;
 	template <typename T, precision P = defaultp> using tvec3 = vec<3, T, P>;

+ 5 - 1
test/bug/bug_ms_vec_static.cpp

@@ -1,3 +1,6 @@
+#include <glm/glm.hpp>
+
+#if GLM_HAS_ALIGNED_TYPE
 struct vec2;
 
 struct _swizzle
@@ -7,7 +10,7 @@ struct _swizzle
 
 struct vec2
 {
-	constexpr vec2() :
+	GLM_CONSTEXPR_CTOR vec2() :
 		x(0), y(0)
 	{}
 
@@ -17,6 +20,7 @@ struct vec2
 		struct { _swizzle xx; };
 	};
 };
+#endif
 
 // Visual C++ has a bug generating the error: fatal error C1001: An internal error has occurred in the compiler.
 // vec2 Bar;