Skip to content

G
glslang
Unverified Commit 1240db67 by John Kessenich Committed by GitHub
Options

Merge pull request #1749 from dgkoch/dgkoch_common_mscver

Check if _MSC_VER is defined before using.
parents ef807f4b 8b2f96d3
Showing with 2 additions and 2 deletions
SPIRV/SPVRemapper.h
...@@ -45,7 +45,7 @@ namespace spv { ...@@ -45,7 +45,7 @@ namespace spv {
// MSVC defines __cplusplus as an older value, even when it supports almost all of 11. // MSVC defines __cplusplus as an older value, even when it supports almost all of 11.
// We handle that here by making our own symbol. // 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 # define use_cpp11 1
#endif #endif
......
glslang/Include/Common.h
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define _COMMON_INCLUDED_ #define _COMMON_INCLUDED_
#if defined(__ANDROID__) || _MSC_VER < 1700 #if defined(__ANDROID__) || (defined(_MSC_VER) && _MSC_VER < 1700)
#include <sstream> #include <sstream>
namespace std { namespace std {
template<typename T> template<typename T>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment