19 lines
666 B
Diff
19 lines
666 B
Diff
--- include/EASTL/internal/config.h
|
|
+++ include/EASTL/internal/config.h
|
|
@@ -143,7 +143,14 @@
|
|
// http://en.wikipedia.org/wiki/C%2B%2B14#Relaxed_constexpr_restrictions
|
|
//
|
|
#if !defined(EA_CPP14_CONSTEXPR)
|
|
- #if defined(EA_COMPILER_CPP14_ENABLED)
|
|
+
|
|
+ #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
|
|
+ #elif defined(EA_COMPILER_CPP14_ENABLED)
|
|
#define EA_CPP14_CONSTEXPR constexpr
|
|
#else
|
|
#define EA_CPP14_CONSTEXPR // not supported
|