diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 02:43:43 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 02:43:43 +0100 |
| commit | 678a08c8c5e2de508c7517c91e75e0cd49ea3385 (patch) | |
| tree | 9be675a4d19d11df66b5d1abf1653e7a263d530b /src/server/game/Globals/ObjectMgr.h | |
| parent | 0f082e8f925f17e585fd221b901f55581d2d68ab (diff) | |
Core: Fix multiple warnings
Travis should be building again now
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -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 f7b2b6a5408..ec3fa29b952 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -39,6 +39,7 @@ #include "ConditionMgr.h" #include "DB2Stores.h" #include <string> +#include <tuple> #include <map> #include <limits> #include <functional> @@ -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: |