summaryrefslogtreecommitdiffstats
path: root/Tools/ProtoProxy/Globals.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-29 11:48:57 +0200
committermadmaxoft <github@xoft.cz>2014-04-29 11:48:57 +0200
commite39f2a21d550626b962a342b23e0adfb491e6e48 (patch)
tree0e046d10bb70e9b90435544a944a38e154836903 /Tools/ProtoProxy/Globals.h
parentAdded missing initialization. (diff)
downloadcuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar.gz
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar.bz2
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar.lz
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar.xz
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.tar.zst
cuberite-e39f2a21d550626b962a342b23e0adfb491e6e48.zip
Diffstat (limited to '')
-rw-r--r--Tools/ProtoProxy/Globals.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index e2f5aa860..186efa611 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -216,6 +216,20 @@ typedef unsigned char Byte;
// Pretty much the same as ASSERT() but stays in Release builds
#define VERIFY( x ) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), exit(1), 0 ) )
+// Allow both Older versions of MSVC and newer versions of everything use a shared_ptr:
+// Note that we cannot typedef, because C++ doesn't allow (partial) templates to be typedeffed.
+#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)
+ // C++11 has std::shared_ptr in <memory>, included earlier
+ #define SharedPtr std::shared_ptr
+#else
+ // C++03 has std::tr1::shared_ptr in <tr1/memory>
+ #include <tr1/memory>
+ #define SharedPtr std::tr1::shared_ptr
+#endif
+