|
|
@@ -494,14 +494,14 @@
|
|
|
// N1720
|
|
|
#define GLM_HAS_STATIC_ASSERT ( \
|
|
|
(GLM_LANG & GLM_LANG_CXX11_FLAG) || \
|
|
|
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2010)) || \
|
|
|
+ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC10)) || \
|
|
|
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
|
|
|
__has_feature(cxx_static_assert))
|
|
|
|
|
|
// N1988
|
|
|
#define GLM_HAS_EXTENDED_INTEGER_TYPE ( \
|
|
|
(GLM_LANG & GLM_LANG_CXX11_FLAG) || \
|
|
|
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \
|
|
|
+ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11)) || \
|
|
|
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \
|
|
|
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER >= GLM_COMPILER_CLANG29)))
|
|
|
|
|
|
@@ -514,7 +514,7 @@
|
|
|
// N2672
|
|
|
#define GLM_HAS_INITIALIZER_LISTS ( \
|
|
|
(GLM_LANG & GLM_LANG_CXX11_FLAG) || \
|
|
|
- ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
|
|
|
+ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12))) || \
|
|
|
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC44)) || \
|
|
|
__has_feature(cxx_generalized_initializers))
|
|
|
|
|
|
@@ -531,7 +531,7 @@
|
|
|
# endif//(GLM_COMPILER & GLM_COMPILER_GCC)
|
|
|
|
|
|
# if(GLM_COMPILER & GLM_COMPILER_VC)
|
|
|
-# if(GLM_COMPILER > GLM_COMPILER_VC2005)
|
|
|
+# if(GLM_COMPILER > GLM_COMPILER_VC8)
|
|
|
# define GLM_HAS_OPENMP 20
|
|
|
# endif
|
|
|
# endif//(GLM_COMPILER & GLM_COMPILER_GCC)
|