Fix C++11 feature detection for undefined _MSC_VER (#7255)

diff --git a/src/cguittfont/irrUString.h b/src/cguittfont/irrUString.h
index eb7abe5a13d25be685244b7fcca7e82536b0023f..5b10e236740ab02ba1250d52934c9633560aacd6 100644 (file)
--- a/src/cguittfont/irrUString.h
+++ b/src/cguittfont/irrUString.h
@@ -31,7 +31,7 @@
 #ifndef __IRR_USTRING_H_INCLUDED__
 #define __IRR_USTRING_H_INCLUDED__
 
-#if (__cplusplus > 199711L) || (_MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
 #      define USTRING_CPP0X
 #      if defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))
 #              define USTRING_CPP0X_NEWLITERALS

diff --git a/src/util/cpp11.h b/src/util/cpp11.h
index 14913cb865f7ccc36f3d3a939d862d77588a3691..17903f2e324af981905e99fc78b07fbd7442df91 100644 (file)
--- a/src/util/cpp11.h
+++ b/src/util/cpp11.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MT_CPP11_HEADER
 #define MT_CPP11_HEADER
 
-#if __cplusplus < 201103L || _MSC_VER < 1600
+#if __cplusplus < 201103L || (defined(_MSC_VER) && _MSC_VER < 1600)
 #define USE_CPP11_FAKE_KEYWORD
 #endif
 

diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h
index 0194385fc042e9153c6b97c233528306c1bdf0c9..a09154071752fca8d7996315039b670159b7116b 100644 (file)
--- a/src/util/cpp11_container.h
+++ b/src/util/cpp11_container.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define USE_UNORDERED_CONTAINERS
 #endif
 
-#if _MSC_VER >= 1600
+#if defined(_MSC_VER) && _MSC_VER >= 1600
 #define USE_UNORDERED_CONTAINERS
 #endif