diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-11-04 21:04:40 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-11-04 21:04:40 +0100 |
| commit | 2c23a686e30cd23dbfa18f2fdfac0282052731ab (patch) | |
| tree | 5b632ff21bf4b6a0faadeb653a2e9c7bf3612732 | |
| parent | b7b49fe35f87e83813466cb302ff17381792e607 (diff) | |
Dep/g3d: Removed std::shared_ptr, std::weak_ptr, std::dynamic_pointer_cast, std::static_pointer_cast and std::enable_shared_from_this from global namespace
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix6.diff | 32 | ||||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 1 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/platform.h | 8 |
3 files changed, 39 insertions, 2 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix6.diff b/dep/g3dlite/G3D-v9.0 hotfix6.diff new file mode 100644 index 00000000000..3ff735c734e --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix6.diff @@ -0,0 +1,32 @@ +diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h +index 17e3bf2..439495a 100644 +--- a/dep/g3dlite/include/G3D/platform.h ++++ b/dep/g3dlite/include/G3D/platform.h +@@ -364,13 +364,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\ + #endif + #if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__)) + # include <tr1/memory> ++#else ++# include <memory> ++#endif ++ ++namespace G3D { ++#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__)) + using std::tr1::shared_ptr; + using std::tr1::weak_ptr; + using std::tr1::dynamic_pointer_cast; + using std::tr1::static_pointer_cast; + using std::tr1::enable_shared_from_this; + #else +-# include <memory> + using std::shared_ptr; + using std::weak_ptr; + using std::dynamic_pointer_cast; +@@ -378,7 +383,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\ + using std::enable_shared_from_this; + #endif + +-namespace G3D { + /** Options for initG3D and initGLG3D. */ + class G3DSpecification { + public: diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index bcd418d1d0e..d4e3fa5d06b 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -15,3 +15,4 @@ G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings G3D-v9.0 hotfix3.diff - 2015-06-28 - fix some warnings G3D-v9.0 hotfix4.diff - 2015-07-02 - backport G3D10 fix G3D-v9.0 hotfix5.diff - 2015-07-31 - fix MSVC 2015 warning: dep/g3dlite/include/G3D/Quat.h(352): warning C4458: declaration of 'x' hides class member +G3D-v9.0 hotfix6.diff - 2015-11-04 - fix adding std::shared_ptr, std::weak_ptr, std::dynamic_pointer_cast, std::static_pointer_cast and std::enable_shared_from_this to global namespace diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h index 17e3bf279eb..439495ab131 100644 --- a/dep/g3dlite/include/G3D/platform.h +++ b/dep/g3dlite/include/G3D/platform.h @@ -364,13 +364,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\ #endif #if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__)) # include <tr1/memory> +#else +# include <memory> +#endif + +namespace G3D { +#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__)) using std::tr1::shared_ptr; using std::tr1::weak_ptr; using std::tr1::dynamic_pointer_cast; using std::tr1::static_pointer_cast; using std::tr1::enable_shared_from_this; #else -# include <memory> using std::shared_ptr; using std::weak_ptr; using std::dynamic_pointer_cast; @@ -378,7 +383,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\ using std::enable_shared_from_this; #endif -namespace G3D { /** Options for initG3D and initGLG3D. */ class G3DSpecification { public: |