mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1749 from dgkoch/dgkoch_common_mscver

Browse Source 
Check if _MSC_VER is defined before using.
This commit is contained in:
John Kessenich 2019-04-04 14:29:31 +07:00 committed by GitHub
commit 1240db678c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/SPVRemapper.h
View File

@ -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

2
glslang/Include/Common.h
View File

@ -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>