diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-12-22 21:19:13 +0100 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-12-22 21:19:13 +0100 |
| commit | 3389b234ae96f57518f994003d66ed219e5f9030 (patch) | |
| tree | ed777b22dce19a4914f4586f7a93c9c3721208b5 /Tools/QtBiomeVisualiser/Globals.h | |
| parent | Merge pull request #2790 from Gargaj/waterbottle (diff) | |
| parent | Removed offending tr1 references. (diff) | |
| download | cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.gz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.bz2 cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.lz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.xz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.zst cuberite-3389b234ae96f57518f994003d66ed219e5f9030.zip | |
Diffstat (limited to 'Tools/QtBiomeVisualiser/Globals.h')
| -rw-r--r-- | Tools/QtBiomeVisualiser/Globals.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/Tools/QtBiomeVisualiser/Globals.h b/Tools/QtBiomeVisualiser/Globals.h index cc90f9383..d73881868 100644 --- a/Tools/QtBiomeVisualiser/Globals.h +++ b/Tools/QtBiomeVisualiser/Globals.h @@ -330,19 +330,8 @@ void inline LOGERROR(const char* a_Format, ...) #define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0)) #endif -// 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 (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 +// C++11 has std::shared_ptr in <memory>, included earlier +#define SharedPtr std::shared_ptr @@ -385,8 +374,3 @@ T Clamp(T a_Value, T a_Min, T a_Max) #include "src/BiomeDef.h" #include "src/BlockID.h" #include "src/BlockInfo.h" - - - - - |