diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-05-06 21:15:19 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-05-06 21:15:19 +0200 |
| commit | 696a7bc52e9b029b627feee76eaf5e1239417033 (patch) | |
| tree | ac3e5152dd6e7eb2a9420daad8df3bb2560d544f /Tools | |
| parent | Suggestions'd #2 (diff) | |
| parent | Merge pull request #978 from mc-server/VectorAssignmentOperator (diff) | |
| download | cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.gz cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.bz2 cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.lz cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.xz cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.zst cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.zip | |
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/ProtoProxy/Globals.h | 2 |
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 |