From dfc71765f87a0710547dc5010e592ed8075c0878 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sat, 4 Jul 2015 01:47:46 +0100 Subject: Core/ObjectMgr: Fix 3 -Wunused-private-field warnings in TempSummonGroupKey Replace a memcmp by a lexicographical comparison with std::tie (cherry picked from commit 1df20a2134dbb84d1eb30024171ccd7e8b103e47) --- src/server/game/Globals/ObjectMgr.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 267a2c555a2..601537d9035 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -37,6 +37,7 @@ #include "ObjectDefines.h" #include "VehicleDefines.h" #include +#include #include #include #include "ConditionMgr.h" @@ -67,8 +68,8 @@ struct TempSummonGroupKey bool operator<(TempSummonGroupKey const& rhs) const { - // memcmp is only reliable if struct doesn't have any padding (packed) - return memcmp(this, &rhs, sizeof(TempSummonGroupKey)) < 0; + return std::tie(_summonerEntry, _summonerType, _summonGroup) < + std::tie(rhs._summonerEntry, rhs._summonerType, rhs._summonGroup); } private: -- cgit v1.2.3