From 76f1f85d8bc3f9dda2ee174f457b5f07468a7dc5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 23 Oct 2014 21:34:03 +0200 Subject: Core/Entities: Second part of required database changes for migrating guids to 128 bit - all fields storing lowguid must be extended to uint64 --- src/server/game/Entities/Object/ObjectGuid.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/server/game/Entities/Object') diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 6cefc8bc34e..26423f88015 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -114,7 +114,7 @@ class ObjectGuid return HighGuid((temp == HIGHGUID_CORPSE || temp == HIGHGUID_AREATRIGGER) ? temp : ((temp >> 4) & 0x00000FFF)); } uint32 GetEntry() const { return HasEntry() ? uint32((_low >> 32) & UI64LIT(0x00000000000FFFFF)) : 0; } - uint32 GetCounter() const + LowType GetCounter() const { return uint32(_low & UI64LIT(0x00000000FFFFFFFF)); } @@ -290,11 +290,12 @@ namespace std template<> struct hash { - public: - size_t operator()(ObjectGuid const& key) const - { - return boost::hash_range(reinterpret_cast(&key), reinterpret_cast(&key) + 2); - } + public: + size_t operator()(ObjectGuid const& key) const + { + return boost::hash_range(reinterpret_cast(&key), reinterpret_cast(&key) + 2); + } + }; }; } -- cgit v1.2.3