flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 Fixed TupleHelper::hash() using the wrong overload of qHash() found by ADL.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-05 00:05:10 +01:00
parent 9867b4a6df
commit 38cfebc55c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/valueobject_private.h
View File

@@ -57,13 +57,18 @@ namespace BlackMisc
virtual void toIcon(const void *object, CIcon &o_icon) const = 0; virtual void toIcon(const void *object, CIcon &o_icon) const = 0;
}; };
//! \private
namespace Fallback
{
//! \private Fallback in case qHash is not defined for T. //! \private Fallback in case qHash is not defined for T.
template <typename T> template <typename T>
uint qHash(const T &) { return 0; } uint qHash(const T &object) { return 0; }
//! \private Fallback in case compare is not defined for T. //! \private Fallback in case compare is not defined for T.
template <typename T> template <typename T>
int compare(const T &, const T &) { return 0; } int compare(const T &a, const T &) { return 0; }
}
//! \private Implementation of IValueObjectMetaInfo representing the set of operations supported by T. //! \private Implementation of IValueObjectMetaInfo representing the set of operations supported by T.
template <typename T> template <typename T>
@@ -111,6 +116,7 @@ namespace BlackMisc
} }
virtual uint getValueHash(const void *object) const override virtual uint getValueHash(const void *object) const override
{ {
using Private::Fallback::qHash;
return qHash(cast(object)); return qHash(cast(object));
} }
virtual int getMetaTypeId() const override virtual int getMetaTypeId() const override
@@ -124,6 +130,7 @@ namespace BlackMisc
} }
virtual int compareImpl(const void *lhs, const void *rhs) const override virtual int compareImpl(const void *lhs, const void *rhs) const override
{ {
using Private::Fallback::compare;
return compare(cast(lhs), cast(rhs)); return compare(cast(lhs), cast(rhs));
} }
virtual void setPropertyByIndex(void *object, const CVariant &variant, const CPropertyIndex &index) const override virtual void setPropertyByIndex(void *object, const CVariant &variant, const CPropertyIndex &index) const override