diff options
| author | Mattes D <github@xoft.cz> | 2014-05-10 21:27:57 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-05-10 21:27:57 +0200 |
| commit | 28815252e6ff086c0fab7cf56be4839f3d8612a3 (patch) | |
| tree | 4532e85cbcc873a2616147713e9f899ecf84d111 /Tools | |
| parent | Client cert is not requested. (diff) | |
| parent | Merge pull request #993 from mc-server/GridStructGen (diff) | |
| download | cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar.gz cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar.bz2 cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar.lz cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar.xz cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.tar.zst cuberite-28815252e6ff086c0fab7cf56be4839f3d8612a3.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 |