Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/G3D: Backport warning fix from G3D10

Browse Source
This commit is contained in:
jackpoz
2016-10-10 20:16:55 +02:00
parent 04618be427
commit bf5c37a5d0
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dep/g3dlite/G3D-v9.0 hotfix7.diff Normal file
View File

@@ -0,0 +1,16 @@
dep/g3dlite/include/G3D/g3dmath.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h
index a32fdaf..54cc6ed 100644
--- a/dep/g3dlite/include/G3D/g3dmath.h
+++ b/dep/g3dlite/include/G3D/g3dmath.h
@@ -934,7 +934,7 @@ inline double signedPow(double b, double e) {
namespace std {
inline int pow(int a, int b) {
- return (int)pow(double(a), double(b));
+ return (int)::pow(double(a), double(b));
}
}

1
dep/g3dlite/Readme.txt
View File

@@ -16,3 +16,4 @@ 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
G3D-v9.0 hotfix7.diff - 2016-10-10 - fix warning on clang 3.8 backported from G3D 10

2
dep/g3dlite/include/G3D/g3dmath.h
View File

@@ -934,7 +934,7 @@ inline double signedPow(double b, double e) {
namespace std {
inline int pow(int a, int b) {
return (int)pow(double(a), double(b));
return (int)::pow(double(a), double(b));
}
}