diff options
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix7.diff | 16 | ||||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 1 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/g3dmath.h | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix7.diff b/dep/g3dlite/G3D-v9.0 hotfix7.diff new file mode 100644 index 00000000000..1df0cff8ca1 --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix7.diff @@ -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)); + } + + } diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index d4e3fa5d06b..e94dbaabd7e 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -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 diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h index a32fdaf604d..54cc6ed3704 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)); } } |