diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 01:47:46 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 01:50:35 +0100 |
| commit | dfc71765f87a0710547dc5010e592ed8075c0878 (patch) | |
| tree | a0632d2bf8c2b5fca44c1aac3c94d7c513cc36dc | |
| parent | 37b157746e075294fd14abef5cc8e611b7bf2c76 (diff) | |
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)
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 <string> +#include <tuple> #include <map> #include <limits> #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: |