- Fixes the hash definition in ObjectGuid.h. This looks like it allows mangos to compile on FreeBSD 10 with clang

This commit is contained in:
bels 2014-06-11 20:27:34 -04:00 committed by Antz
parent 23d7b418dc
commit 3bc66c3be1

View file

@ -310,8 +310,11 @@ ByteBuffer& operator>> (ByteBuffer& buf, PackedGuidReader const& guid);
inline PackedGuid ObjectGuid::WriteAsPacked() const { return PackedGuid(*this); } inline PackedGuid ObjectGuid::WriteAsPacked() const { return PackedGuid(*this); }
#if defined(__FreeBSD__)
namespace std{
# else
HASH_NAMESPACE_START HASH_NAMESPACE_START
#endif
template<> template<>
class hash<ObjectGuid> class hash<ObjectGuid>
{ {
@ -322,8 +325,12 @@ class hash<ObjectGuid>
return hash<uint64>()(key.GetRawValue()); return hash<uint64>()(key.GetRawValue());
} }
}; };
#if defined(__FreeBSD__)
}
# else
HASH_NAMESPACE_END HASH_NAMESPACE_END
#endif
#define DEFINE_READGUIDMASK(T1, T2) template <T1> \ #define DEFINE_READGUIDMASK(T1, T2) template <T1> \
void ByteBuffer::ReadGuidMask(ObjectGuid& guid) \ void ByteBuffer::ReadGuidMask(ObjectGuid& guid) \