summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-05-04 14:39:21 +0200
committermadmaxoft <github@xoft.cz>2014-05-04 14:39:21 +0200
commite88811e58960d2622a58b6c6f776bd917e0a233d (patch)
tree3e7b57ba70caa71fcdfccc03859065ec8529a99d
parentFixed pressure plate oversights (diff)
downloadcuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar.gz
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar.bz2
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar.lz
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar.xz
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.tar.zst
cuberite-e88811e58960d2622a58b6c6f776bd917e0a233d.zip
-rw-r--r--Tools/ProtoProxy/Globals.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index 54e7e9251..a9b5aa1b1 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -221,7 +221,7 @@ typedef unsigned char Byte;
#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