From 6945d86e674c1dd70b167c49fa8fe08d2ad38110 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 14 Jun 2011 14:13:52 +0400 Subject: [PATCH] [11630] Possible fixed recent problems with build. Removed support hash_value look like not used directly in MaNGOS by testing diff Visual Studio versions and start create rpoblem after recent changes. --- src/framework/Utilities/UnorderedMapSet.h | 12 ------------ src/game/ObjectGuid.h | 6 ------ src/shared/revision_nr.h | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h index a50d7ec25..d3d8e2a4a 100644 --- a/src/framework/Utilities/UnorderedMapSet.h +++ b/src/framework/Utilities/UnorderedMapSet.h @@ -133,16 +133,4 @@ using std::hash_map; using std::hash_set; #endif -#if COMPILER != COMPILER_MICROSOFT - -// Visual Studio use non standard hash calculation function, so provide fake forward for other -HASH_NAMESPACE_START - -template -size_t hash_value(K const&); - -HASH_NAMESPACE_END - -#endif - #endif diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h index 9022d8502..b35cd48a2 100644 --- a/src/game/ObjectGuid.h +++ b/src/game/ObjectGuid.h @@ -269,12 +269,6 @@ HASH_NAMESPACE_START } }; - // for pre-TR1 Visual Studio versions (VS90 SP1 or early) - inline size_t hash_value(ObjectGuid const& key) - { - return hash_value(key.GetRawValue()); - } - HASH_NAMESPACE_END #endif diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0449c3e5d..c0d99ce6b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11629" + #define REVISION_NR "11630" #endif // __REVISION_NR_H__