fix clang never using constexpr (#326)

electronicarts · Dec 10, 2019 · 970c853 · 970c853
1 parent 4b6dda1
commit 970c853
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
@@ -143,18 +143,20 @@
 // http://en.wikipedia.org/wiki/C%2B%2B14#Relaxed_constexpr_restrictions
 //
 #if !defined(EA_CPP14_CONSTEXPR)
-
 	#if defined(EA_COMPILER_MSVC_2015)
-		#define EA_CPP14_CONSTEXPR  // not supported
-		#define EA_NO_CPP14_CONSTEXPR 
-	#elif defined(__GNUC__) && (EA_COMPILER_VERSION < 9000)   // Before GCC 9.0
-		#define EA_CPP14_CONSTEXPR  // not supported
-		#define EA_NO_CPP14_CONSTEXPR 
+		#define EA_CPP14_CONSTEXPR // not supported
+		#define EA_NO_CPP14_CONSTEXPR
+	#elif defined(EA_COMPILER_GNUC) && (EA_COMPILER_VERSION < 9000)     // Before GCC 9.0
+		#define EA_CPP14_CONSTEXPR                                      // not supported
+		#define EA_NO_CPP14_CONSTEXPR
+	#elif defined(EA_COMPILER_CLANG) && (EA_COMPILER_VERSION < 500)     // Before clang5
+		#define EA_CPP14_CONSTEXPR                                      // not supported
+		#define EA_NO_CPP14_CONSTEXPR
 	#elif defined(EA_COMPILER_CPP14_ENABLED)
 		#define EA_CPP14_CONSTEXPR constexpr
 	#else
-		#define EA_CPP14_CONSTEXPR  // not supported
-		#define EA_NO_CPP14_CONSTEXPR 
+		#define EA_CPP14_CONSTEXPR // not supported
+		#define EA_NO_CPP14_CONSTEXPR
 	#endif
 #endif