Browse Source

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

Christophe Riccio 9 years ago
parent
commit
fd06877778

+ 1 - 1
glm/detail/type_vec1.hpp

@@ -102,7 +102,7 @@ namespace glm
 		// -- Explicit basic constructors --
 		// -- Explicit basic constructors --
 
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor);
 		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 --
 		// -- Conversion vector constructors --
 
 

+ 1 - 1
glm/detail/type_vec1.inl

@@ -63,7 +63,7 @@ namespace glm
 	{}
 	{}
 
 
 	template <typename T, precision P>
 	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)
 		: x(scalar)
 	{}
 	{}
 
 

+ 1 - 1
glm/detail/type_vec2.hpp

@@ -102,7 +102,7 @@ namespace glm
 		// -- Explicit basic constructors --
 		// -- Explicit basic constructors --
 
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec2(ctor);
 		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);
 		GLM_FUNC_DECL GLM_CONSTEXPR tvec2(T s1, T s2);
 
 
 		// -- Conversion constructors --
 		// -- Conversion constructors --

+ 1 - 1
glm/detail/type_vec2.inl

@@ -72,7 +72,7 @@ namespace glm
 	{}
 	{}
 
 
 	template <typename T, precision P>
 	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)
 		: x(scalar), y(scalar)
 	{}
 	{}
 
 

+ 1 - 1
glm/detail/type_vec3.hpp

@@ -103,7 +103,7 @@ namespace glm
 		// -- Explicit basic constructors --
 		// -- Explicit basic constructors --
 
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec3(ctor);
 		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);
 		GLM_FUNC_DECL GLM_CONSTEXPR tvec3(T a, T b, T c);
 
 
 		// -- Conversion scalar constructors --
 		// -- Conversion scalar constructors --

+ 1 - 1
glm/detail/type_vec3.inl

@@ -89,7 +89,7 @@ namespace glm
 	{}
 	{}
 
 
 	template <typename T, precision P>
 	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)
 		: x(scalar), y(scalar), z(scalar)
 	{}
 	{}