diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-02 14:16:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-02 14:16:28 +0200 |
commit | 4cb0887660861402fe6857662e622488adb86514 (patch) | |
tree | 9efcbd201f688ce85a2a87611c431c71491dbf9b /thirdparty | |
parent | 78af5625d0c0a6a88069e67c2da75a31ea518218 (diff) | |
parent | f48bb8fac8f6036c0077bb53a5ae37bb03832e7b (diff) |
Merge pull request #30249 from marxin/fix-gcc9-warnings
Fix few GCC9 warnings:
Diffstat (limited to 'thirdparty')
-rw-r--r-- | thirdparty/assimp/include/assimp/types.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/thirdparty/assimp/include/assimp/types.h b/thirdparty/assimp/include/assimp/types.h index 748e4851f3..331b8cd03f 100644 --- a/thirdparty/assimp/include/assimp/types.h +++ b/thirdparty/assimp/include/assimp/types.h @@ -161,7 +161,14 @@ struct aiColor3D explicit aiColor3D (ai_real _r) : r(_r), g(_r), b(_r) {} aiColor3D (const aiColor3D& o) : r(o.r), g(o.g), b(o.b) {} - /** Component-wise comparison */ + aiColor3D &operator=(const aiColor3D &o) { + r = o.r; + g = o.g; + b = o.b; + return *this; + } + + /** Component-wise comparison */ // TODO: add epsilon? bool operator == (const aiColor3D& other) const {return r == other.r && g == other.g && b == other.b;} |