Merge pull request #1749 from dgkoch/dgkoch_common_mscver

Check if _MSC_VER is defined before using.

Merge pull request #1749 from dgkoch/dgkoch_common_mscver
1240db67 · John Kessenich · GitHub · ef807f4b · 8b2f96d3 · 1240db67
Unverified Commit 1240db67 authored Apr 04, 2019 by John Kessenich Committed by GitHub Apr 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

SPVRemapper.h SPIRV/SPVRemapper.h +1 -1

Common.h glslang/Include/Common.h +1 -1

No files found.
--- a/SPIRV/SPVRemapper.h
+++ b/SPIRV/SPVRemapper.h
@@ -45,7 +45,7 @@ namespace spv {

 // MSVC defines __cplusplus as an older value, even when it supports almost all of 11.
 // We handle that here by making our own symbol.
-#if __cplusplus >= 201103L || _MSC_VER >= 1700
+#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1700)
 #   define use_cpp11 1
 #endif


--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -38,7 +38,7 @@
 #define _COMMON_INCLUDED_


-#if defined(__ANDROID__) || _MSC_VER < 1700
+#if defined(__ANDROID__) || (defined(_MSC_VER) && _MSC_VER < 1700)
 #include <sstream>
 namespace std {
 template<typename T>