josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dep/g3d: Fix warnings with gcc 16

Browse Source
This commit is contained in:
Shauren
2026-05-07 16:43:22 +02:00
parent 2371cabb29
commit a4cdde85c2
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/g3dlite/G3D-v9.0 hotfix21.diff
+35
View File
@@ -0,0 +1,35 @@
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
index 400a81361e..a38e87a641 100644
--- a/dep/g3dlite/include/G3D/platform.h
+++ b/dep/g3dlite/include/G3D/platform.h
@@ -366,29 +366,14 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
// Bring in shared_ptr and weak_ptr
-#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__linux__)
-#include <ciso646> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
-#endif
-#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
-# include <tr1/memory>
-#else
-# include <memory>
-#endif
+#include <memory>
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
using std::shared_ptr;
using std::weak_ptr;
using std::dynamic_pointer_cast;
using std::static_pointer_cast;
using std::enable_shared_from_this;
-#endif
/** Options for initG3D and initGLG3D. */
class G3DSpecification {
dep/g3dlite/Readme.txt
+1
View File
@@ -30,3 +30,4 @@ G3D-v9.0 hotfix17.diff - 2023-03-25 - Fix macOS compile errors
G3D-v9.0 hotfix18.diff - 2024-02-17 - ARM64 support on MSVC G3D-v9.0 hotfix18.diff - 2024-02-17 - ARM64 support on MSVC
G3D-v9.0 hotfix19.diff - 2024-06-09 - clang build fix on windows G3D-v9.0 hotfix19.diff - 2024-06-09 - clang build fix on windows
G3D-v9.0 hotfix20.diff - 2026-05-07 - gcc build fix on windows G3D-v9.0 hotfix20.diff - 2026-05-07 - gcc build fix on windows
G3D-v9.0 hotfix21.diff - 2026-05-07 - gcc 16 warning fix
dep/g3dlite/include/G3D/platform.h
+1 -16
View File
@@ -366,29 +366,14 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
// Bring in shared_ptr and weak_ptr // Bring in shared_ptr and weak_ptr
#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__linux__) #include <memory>
#include <ciso646> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
#endif
#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
# include <tr1/memory>
#else
# include <memory>
#endif
namespace G3D { 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
using std::shared_ptr; using std::shared_ptr;
using std::weak_ptr; using std::weak_ptr;
using std::dynamic_pointer_cast; using std::dynamic_pointer_cast;
using std::static_pointer_cast; using std::static_pointer_cast;
using std::enable_shared_from_this; using std::enable_shared_from_this;
#endif
/** Options for initG3D and initGLG3D. */ /** Options for initG3D and initGLG3D. */
class G3DSpecification { class G3DSpecification {