mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
- reverted one macro change
This commit is contained in:
parent
2b45e13c5c
commit
cb9a750701
2
Global.h
2
Global.h
@ -40,7 +40,7 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
|
||||
#endif
|
||||
|
||||
//nullptr - only msvc and gcc-4.6 or later, othervice define it as nullptr
|
||||
#if (defined(__GNUC__)) && (GCC_VERSION < 460)
|
||||
#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 460)) && !(defined(__clang__))
|
||||
#define nullptr NULL
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user