5 files changed, 73 insertions, 7 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix5.diff b/dep/g3dlite/G3D-v9.0 hotfix5.diff
new file mode 100644
index 00000000000..7bc4073ef62
--- /dev/null
+++ b/dep/g3dlite/G3D-v9.0 hotfix5.diff
@@ -0,0 +1,28 @@
+diff --git a/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h
+index 04e11e0..b26708a 100644
+--- a/dep/g3dlite/include/G3D/Quat.h
++++ b/dep/g3dlite/include/G3D/Quat.h
+@@ -335,8 +335,8 @@ public:
+      Note that q.pow(a).pow(b) == q.pow(a + b)
+      @cite Dam98 pg 21
+      */
+-    inline Quat pow(float x) const {
+-        return (log() * x).exp();
++    inline Quat pow(float r) const {
++        return (log() * r).exp();
+     }
+ 
+     /** Make unit length in place */
+@@ -349,9 +349,9 @@ public:
+      the magnitude.
+      */
+     Quat toUnit() const {
+-        Quat x = *this;
+-        x.unitize();
+-        return x;
++        Quat copyOfThis = *this;
++        copyOfThis.unitize();
++        return copyOfThis;
+     }
+ 
+     /**
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 682a2404d96..d4e3fa5d06b 100644
--- a/dep/g3dlite/Readme.txt
+++ b/dep/g3dlite/Readme.txt
@@ -14,3 +14,5 @@ G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches
 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/Quat.h b/dep/g3dlite/include/G3D/Quat.h
index 04e11e084a0..73e661a4f48 100644
--- a/dep/g3dlite/include/G3D/Quat.h
+++ b/dep/g3dlite/include/G3D/Quat.h
@@ -335,8 +335,8 @@ public:
      Note that q.pow(a).pow(b) == q.pow(a + b)
      @cite Dam98 pg 21
      */
-    inline Quat pow(float x) const {
-        return (log() * x).exp();
+    inline Quat pow(float r) const {
+        return (log() * r).exp();
     }
 
     /** Make unit length in place */
@@ -349,9 +349,9 @@ public:
      the magnitude.
      */
     Quat toUnit() const {
-        Quat x = *this;
-        x.unitize();
-        return x;
+        Quat copyOfThis = *this;
+        copyOfThis.unitize();
+        return copyOfThis;
     }
 
     /**
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: