From f5ab820ffe6e9fee069d851d256b56892d35019d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 7 Jan 2017 12:49:45 +0100 Subject: [PATCH] Fixed build --- glm/detail/type_vec.hpp | 1 - test/bug/bug_ms_vec_static.cpp | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glm/detail/type_vec.hpp b/glm/detail/type_vec.hpp index ba721681..4fe69c18 100644 --- a/glm/detail/type_vec.hpp +++ b/glm/detail/type_vec.hpp @@ -102,7 +102,6 @@ namespace detail }//namespace detail #if GLM_HAS_TEMPLATE_ALIASES - template struct vec; template using tvec1 = vec<1, T, P>; template using tvec2 = vec<2, T, P>; template using tvec3 = vec<3, T, P>; diff --git a/test/bug/bug_ms_vec_static.cpp b/test/bug/bug_ms_vec_static.cpp index 12e6ff51..8bc2fadc 100644 --- a/test/bug/bug_ms_vec_static.cpp +++ b/test/bug/bug_ms_vec_static.cpp @@ -1,3 +1,6 @@ +#include + +#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;