summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-05-01 20:21:54 +0200
committerMattes D <github@xoft.cz>2014-05-01 20:22:23 +0200
commita2cffb0363e42f12019712297e764a269b6a7d9a (patch)
tree01ce20c92d495292f9fbe7c62dacb68e3ba7fbd5
parentMerge pull request #971 from worktycho/polarssl-local (diff)
downloadcuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar.gz
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar.bz2
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar.lz
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar.xz
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.tar.zst
cuberite-a2cffb0363e42f12019712297e764a269b6a7d9a.zip
Diffstat (limited to '')
-rw-r--r--src/Globals.h2
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