Change compiler version handling

martinmoene · Sep 25, 2015 · 2c43a2e · 2c43a2e
1 parent 6fd526c
commit 2c43a2e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lest_cpp03.hpp b/lest_cpp03.hpp
@@ -74,14 +74,20 @@
 # endif
 #endif
 
-#if ( __cplusplus >= 201103L )
-# define lest_CPP11_OR_GREATER
+#if defined(_MSC_VER)
+# define lest_COMPILER_MSVC_VERSION   ((_MSC_VER - 600 ) / 100)
+#else
+# define lest_COMPILER_MSVC_VERSION   0
 #endif
 
-#if defined( _MSC_VER ) && ( 1200 <= _MSC_VER && _MSC_VER < 1300 )
+#if lest_COMPILER_MSVC_VERSION == 6
 # define lest_COMPILER_IS_MSVC6
 #endif
 
+#if ( __cplusplus >= 201103L ) || lest_COMPILER_MSVC_VERSION >= 12
+# define lest_CPP11_OR_GREATER
+#endif
+
 #ifdef lest_CPP11_OR_GREATER
 
 # include <cstdint>