Merge pull request #549 from j6t/master

Work around ambiguous operator== reported by modern clang.
This commit is contained in:
Leonardo Zide 2020-12-13 10:34:47 -08:00 committed by GitHub
commit 05963fc8b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -48,7 +48,7 @@ public:
void LoadDefaults(); void LoadDefaults();
void SaveDefaults(); void SaveDefaults();
bool operator==(const lcModelProperties& Properties) bool operator==(const lcModelProperties& Properties) const
{ {
if (mFileName != Properties.mFileName || mModelName != Properties.mModelName || mAuthor != Properties.mAuthor || if (mFileName != Properties.mFileName || mModelName != Properties.mModelName || mAuthor != Properties.mAuthor ||
mDescription != Properties.mDescription || mComments != Properties.mComments) mDescription != Properties.mDescription || mComments != Properties.mComments)