diff options
| author | Filippos Karapetis | 2014-10-28 14:17:47 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-10-28 14:17:47 +0200 |
| commit | 84c2267734cea15ea8b2ecae3ca307d835dcfd60 (patch) | |
| tree | 49f9a12a31e34b63bb3ae9e2ca6fd32e7c0c5da0 | |
| parent | b000243dd31d5b709eadd2cdad45ed21f7d0d604 (diff) | |
| parent | daceff7b2d08aa57060592b6eb7a60fe960b048c (diff) | |
| download | scummvm-rg350-84c2267734cea15ea8b2ecae3ca307d835dcfd60.tar.gz scummvm-rg350-84c2267734cea15ea8b2ecae3ca307d835dcfd60.tar.bz2 scummvm-rg350-84c2267734cea15ea8b2ecae3ca307d835dcfd60.zip | |
Merge pull request #502 from SpecLad/visual-c++11
COMMON: Use true nullptr in Visual Studio 2010+ and true override in VS 2012+
| -rw-r--r-- | common/c++11-compat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/c++11-compat.h b/common/c++11-compat.h index 14e0642821..9fd252cc67 100644 --- a/common/c++11-compat.h +++ b/common/c++11-compat.h @@ -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 |