diff options
author | Shauren <shauren.trinity@gmail.com> | 2020-07-13 18:35:13 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 00:18:39 +0100 |
commit | d4568a90b19e1a1247df71332eec90c3e9243a6b (patch) | |
tree | 9644846432caab85799260f0e4c02c7b97407851 /dep/g3dlite | |
parent | 365ae6ff25a288ea83e192066b9cc162a020a844 (diff) |
Fix warnings related to Vector3::operator= and remove -Wno-deprecated-copy suppression
(cherry picked from commit 042b1abfd747160085e5acc24a842a076b20ea01)
Diffstat (limited to 'dep/g3dlite')
-rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix9.diff | 28 | ||||
-rw-r--r-- | dep/g3dlite/include/G3D/Vector3.h | 10 |
2 files changed, 29 insertions, 9 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix9.diff b/dep/g3dlite/G3D-v9.0 hotfix9.diff new file mode 100644 index 00000000000..e07e9cb5c9c --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix9.diff @@ -0,0 +1,28 @@ +diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h +index ef1e39d821..1c42513b45 100644 +--- a/dep/g3dlite/include/G3D/Vector3.h ++++ b/dep/g3dlite/include/G3D/Vector3.h +@@ -128,7 +128,7 @@ public: + Axis primaryAxis() const; + + // assignment and comparison +- Vector3& __fastcall operator= (const Vector3& rkVector); ++ Vector3& operator=(const Vector3& rkVector) = default; + Vector3& operator=(const Any& a); + bool operator== (const Vector3& rkVector) const; + bool operator!= (const Vector3& rkVector) const; +@@ -627,14 +627,6 @@ inline float& Vector3::operator[] (int i) { + } + + +-//---------------------------------------------------------------------------- +-inline Vector3& Vector3::operator= (const Vector3& rkVector) { +- x = rkVector.x; +- y = rkVector.y; +- z = rkVector.z; +- return *this; +-} +- + //---------------------------------------------------------------------------- + + inline bool Vector3::fuzzyEq(const Vector3& other) const { diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h index ef1e39d8211..1c42513b45e 100644 --- a/dep/g3dlite/include/G3D/Vector3.h +++ b/dep/g3dlite/include/G3D/Vector3.h @@ -128,7 +128,7 @@ public: Axis primaryAxis() const; // assignment and comparison - Vector3& __fastcall operator= (const Vector3& rkVector); + Vector3& operator=(const Vector3& rkVector) = default; Vector3& operator=(const Any& a); bool operator== (const Vector3& rkVector) const; bool operator!= (const Vector3& rkVector) const; @@ -628,14 +628,6 @@ inline float& Vector3::operator[] (int i) { //---------------------------------------------------------------------------- -inline Vector3& Vector3::operator= (const Vector3& rkVector) { - x = rkVector.x; - y = rkVector.y; - z = rkVector.z; - return *this; -} - -//---------------------------------------------------------------------------- inline bool Vector3::fuzzyEq(const Vector3& other) const { return G3D::fuzzyEq((*this - other).squaredMagnitude(), 0); |