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
60a5f4aea9
1 changed files with 1 additions and 8 deletions
  1. 1 8
      glm/detail/setup.hpp

+ 1 - 8
glm/detail/setup.hpp

@@ -406,7 +406,7 @@
 #	define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
 #	define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
 #else
 #else
 #	define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
 #	define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
-		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46))))
+		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)))) // GCC 4.6 support constexpr but there is a compiler bug causing a crash
 #	define GLM_HAS_CONSTEXPR_PARTIAL (GLM_HAS_CONSTEXPR || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)))
 #	define GLM_HAS_CONSTEXPR_PARTIAL (GLM_HAS_CONSTEXPR || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)))
 #endif
 #endif
 
 
@@ -743,13 +743,6 @@
 #	define GLM_CONSTEXPR_SIMD
 #	define GLM_CONSTEXPR_SIMD
 #endif
 #endif
 
 
-// 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
-
 #ifdef GLM_FORCE_EXPLICIT_CTOR
 #ifdef GLM_FORCE_EXPLICIT_CTOR
 #	define GLM_EXPLICIT explicit
 #	define GLM_EXPLICIT explicit
 #else
 #else