diff options
| author | madmaxoft <github@xoft.cz> | 2014-05-01 22:16:29 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-05-01 22:16:29 +0200 |
| commit | 4a952717904436cc92a31505149d1729e2994b68 (patch) | |
| tree | d21b857cce4dbac162a597400ab27331a69f1263 /src/Globals.h | |
| parent | Added a missing return statement. (diff) | |
| parent | Merge pull request #973 from mc-server/ItemNoCopyConstructor (diff) | |
| download | cuberite-4a952717904436cc92a31505149d1729e2994b68.tar cuberite-4a952717904436cc92a31505149d1729e2994b68.tar.gz cuberite-4a952717904436cc92a31505149d1729e2994b68.tar.bz2 cuberite-4a952717904436cc92a31505149d1729e2994b68.tar.lz cuberite-4a952717904436cc92a31505149d1729e2994b68.tar.xz cuberite-4a952717904436cc92a31505149d1729e2994b68.tar.zst cuberite-4a952717904436cc92a31505149d1729e2994b68.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Globals.h b/src/Globals.h index a09819ce9..71e9191e4 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -272,7 +272,7 @@ template class SizeChecker<UInt16, 2>; #if (defined(_MSC_VER) && (_MSC_VER < 1600)) // MSVC before 2010 doesn't have std::shared_ptr, but has std::tr1::shared_ptr, defined in <memory> included earlier #define SharedPtr std::tr1::shared_ptr -#elif (__cplusplus >= 201103L) +#elif (defined(_MSC_VER) || (__cplusplus >= 201103L)) // C++11 has std::shared_ptr in <memory>, included earlier #define SharedPtr std::shared_ptr #else |