Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
mazocomp 2018-04-20 20:55:23 +03:00 committed by SmallJoker
parent 9d3fa874be
commit f72490950a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cguittfont/irrUString.h
View File

@ -31,7 +31,7 @@
#ifndef __IRR_USTRING_H_INCLUDED__ #ifndef __IRR_USTRING_H_INCLUDED__
#define __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 # define USTRING_CPP0X
# if defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) # if defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))
# define USTRING_CPP0X_NEWLITERALS # define USTRING_CPP0X_NEWLITERALS

2
src/util/cpp11.h
View File

@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef MT_CPP11_HEADER #ifndef MT_CPP11_HEADER
#define 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 #define USE_CPP11_FAKE_KEYWORD
#endif #endif

2
src/util/cpp11_container.h
View File

@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define USE_UNORDERED_CONTAINERS #define USE_UNORDERED_CONTAINERS
#endif #endif
#if _MSC_VER >= 1600 #if defined(_MSC_VER) && _MSC_VER >= 1600
#define USE_UNORDERED_CONTAINERS #define USE_UNORDERED_CONTAINERS
#endif #endif