diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-01-16 18:50:28 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 00:19:57 +0100 |
| commit | aed8e1c3b4c15f47f3b2659af532f801ff1dc994 (patch) | |
| tree | d2fcb835be60efa547ed0ae7571e1ac38ebf8703 | |
| parent | d4568a90b19e1a1247df71332eec90c3e9243a6b (diff) | |
Fixed -Wdeprecated-copy warning in G3D
(cherry picked from commit a650bd631a4681d09e3ff66f79b73b99299565f3)
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix13.diff | 12 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Vector3.h | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix13.diff b/dep/g3dlite/G3D-v9.0 hotfix13.diff new file mode 100644 index 00000000000..a2127a2907c --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix13.diff @@ -0,0 +1,12 @@ +diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h +index 1c42513b45..05d9b11ed5 100644 +--- a/dep/g3dlite/include/G3D/Vector3.h ++++ b/dep/g3dlite/include/G3D/Vector3.h +@@ -128,7 +128,6 @@ public: + Axis primaryAxis() const; + + // assignment and comparison +- Vector3& operator=(const Vector3& rkVector) = default; + Vector3& operator=(const Any& a); + bool operator== (const Vector3& rkVector) const; + bool operator!= (const Vector3& rkVector) const; diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h index 1c42513b45e..05d9b11ed57 100644 --- a/dep/g3dlite/include/G3D/Vector3.h +++ b/dep/g3dlite/include/G3D/Vector3.h @@ -128,7 +128,6 @@ public: Axis primaryAxis() const; // assignment and comparison - Vector3& operator=(const Vector3& rkVector) = default; Vector3& operator=(const Any& a); bool operator== (const Vector3& rkVector) const; bool operator!= (const Vector3& rkVector) const; |