diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 014c836e..cd68f576 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -102,7 +102,15 @@ namespace glm // -- Explicit basic constructors -- GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec1(T scalar); + + // GCC 4.6 has a bug causing a compiler crash +# if GLM_COMPILER & GLM_COMPILER_GCC +# define GLM_CONSTEXPR_GCC +# else +# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR +# endif + + GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec1(T scalar); // -- Conversion vector constructors -- diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index b70603ff..36432761 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -63,7 +63,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1::tvec1(T scalar) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec1::tvec1(T scalar) : x(scalar) {}