mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-16 14:50:17 +00:00
Merge pull request #502 from SpecLad/visual-c++11
COMMON: Use true nullptr in Visual Studio 2010+ and true override in VS 2012+
This commit is contained in:
commit
84c2267734
@ -32,13 +32,17 @@
|
||||
// though.
|
||||
//
|
||||
#if !defined(nullptr) // XCode 5.0.1 has __cplusplus=199711 but defines this
|
||||
#if !defined(_MSC_VER) || _MSC_VER < 1600
|
||||
#define nullptr 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//
|
||||
// Replacement for the override keyword. This allows compilation of code
|
||||
// which uses it, but does not feature any semantic.
|
||||
//
|
||||
#if !defined(_MSC_VER) || _MSC_VER < 1700
|
||||
#define override
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user