From bb753ec5f787f4b26813cfdb553c737140b12821 Mon Sep 17 00:00:00 2001 From: Josh Ferrell Date: Wed, 7 May 2025 13:47:14 -0400 Subject: Fix compiler error with g++15 --- ui/xreflist.h | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/ui/xreflist.h b/ui/xreflist.h index ea1ce610..3f35e168 100644 --- a/ui/xreflist.h +++ b/ui/xreflist.h @@ -117,17 +117,25 @@ class XrefItem int row() const; bool operator==(const XrefItem& other) const; bool operator!=(const XrefItem& other) const; - size_t operator()(const XrefItem& item) const +}; + +namespace std +{ + template<> struct hash { - size_t hash = std::hash()(item.addr()); - hash ^= std::hash()(item.type()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - hash ^= std::hash()(item.direction()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - hash ^= std::hash()(item.kind()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - hash ^= std::hash()(item.instrId()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - hash ^= std::hash()(item.func() ? item.func()->GetStart() : 0) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - hash ^= std::hash()(item.ilType()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); - return hash; - } + typedef XrefItem argument_type; + size_t operator()(argument_type const& item) const + { + size_t hash = std::hash()(item.addr()); + hash ^= std::hash()(item.type()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= std::hash()(item.direction()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= std::hash()(item.kind()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= std::hash()(item.instrId()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= std::hash()(item.func() ? item.func()->GetStart() : 0) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= std::hash()(item.ilType()) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + return hash; + } + }; }; /*! -- cgit v1.3.1