flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed obsolete tr1::shared_ptr.

Browse Source
This commit is contained in:
Mattes D 2014-10-19 18:52:24 +02:00
parent cf73fee7e3
commit ee23fd5b9e
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Globals.h
View File

@ -361,19 +361,8 @@ void inline LOGD(const char* a_Format, ...)
#define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0)) #define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0))
#endif #endif
// Allow both Older versions of MSVC and newer versions of everything use a shared_ptr: // Unified shared ptr from before C++11. Also no silly undercores.
// Note that we cannot typedef, because C++ doesn't allow (partial) templates to be typedeffed. #define SharedPtr std::shared_ptr
#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 (defined(_MSC_VER) || (__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