Too big bug with GCC 4.6 constexpr, haven't tried 4.7, let's see how 4.8 does

ago%!(EXTRA string=10 years) · fd06877778
parent 60a5f4aea9
commit fd06877778
6 changed files with 6 additions and 6 deletions
--- a/glm/detail/type_vec1.hpp
+++ b/glm/detail/type_vec1.hpp
@ -102,7 +102,7 @@ namespace glm
 		// -- Explicit basic constructors --

 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor);
-		GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec1(T scalar);
+		GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec1(T scalar);

 		// -- Conversion vector constructors --

--- a/glm/detail/type_vec1.inl
+++ b/glm/detail/type_vec1.inl
@ -63,7 +63,7 @@ namespace glm
 	{}

 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec1<T, P>::tvec1(T scalar)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1<T, P>::tvec1(T scalar)
 		: x(scalar)
 	{}

--- a/glm/detail/type_vec2.hpp
+++ b/glm/detail/type_vec2.hpp
@ -102,7 +102,7 @@ namespace glm
 		// -- Explicit basic constructors --

 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec2(ctor);
-		GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec2(T scalar);
+		GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec2(T scalar);
 		GLM_FUNC_DECL GLM_CONSTEXPR tvec2(T s1, T s2);

 		// -- Conversion constructors --
--- a/glm/detail/type_vec2.inl
+++ b/glm/detail/type_vec2.inl
@ -72,7 +72,7 @@ namespace glm
 	{}

 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec2<T, P>::tvec2(T scalar)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2<T, P>::tvec2(T scalar)
 		: x(scalar), y(scalar)
 	{}

--- a/glm/detail/type_vec3.hpp
+++ b/glm/detail/type_vec3.hpp
@ -103,7 +103,7 @@ namespace glm
 		// -- Explicit basic constructors --

 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec3(ctor);
-		GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec3(T scalar);
+		GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec3(T scalar);
 		GLM_FUNC_DECL GLM_CONSTEXPR tvec3(T a, T b, T c);

 		// -- Conversion scalar constructors --
--- a/glm/detail/type_vec3.inl
+++ b/glm/detail/type_vec3.inl
@ -89,7 +89,7 @@ namespace glm
 	{}

 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec3<T, P>::tvec3(T scalar)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3<T, P>::tvec3(T scalar)
 		: x(scalar), y(scalar), z(scalar)
 	{}