Changeset 206 for trunk/src/framework

Timestamp:

11/19/08 13:46:16 (17 years ago)

Author:

yumileroy

Message:

[svn] * Switch from hashmap to unordered map. - cleanup source - mangos. Help - Aokromes

Original author: KingPin?
Date: 2008-11-10 06:53:00-06:00

Location:

trunk/src/framework

Files:

• Dynamic/ObjectRegistry.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Utilities/UnorderedMap.h (moved) (moved from trunk/src/framework/Utilities/HashMap.h) (4 diffs, 1 prop)

trunk/src/framework/Dynamic/ObjectRegistry.h

@@ -23 +23 @@
 
 #include "Platform/Define.h"
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include "Policies/Singleton.h"
 

trunk/src/framework/Makefile.am

@@ -61 +61 @@
     Utilities/Callback.h \
     Utilities/EventProcessor.h \
-    Utilities/HashMap.h \
+    Utilities/UnorderedMap.h \
     Utilities/LinkedList.h \
     Utilities/TypeList.h

trunk/src/framework/Utilities/UnorderedMap.h

@@ -19 +19 @@
  */
 
-#ifndef TRINITY_HASHMAP_H
-#define TRINITY_HASHMAP_H
+#ifndef TRINITY_UNORDERED_MAP_H
+#define TRINITY_UNORDERED_MAP_H
 
 #include "Platform/CompilerDefs.h"
@@ -27 +27 @@
 #if COMPILER == COMPILER_INTEL
 #include <ext/hash_map>
+#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4
+#include <tr1/unordered_map>
 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
 #include <ext/hash_map>
+#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1    // VC9.0 and later
+#include <unordered_map>
 #else
 #include <hash_map>
@@ -34 +38 @@
 
 #ifdef _STLPORT_VERSION
-#define HM_NAMESPACE std
+#define UNORDERED_MAP std::hash_map
 using std::hash_map;
+#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1
+#define UNORDERED_MAP std::tr1::unordered_map
 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300
-#define HM_NAMESPACE stdext
+#define UNORDERED_MAP stdext::hash_map
 using stdext::hash_map;
 #elif COMPILER == COMPILER_INTEL
-#define HM_NAMESPACE std
+#define UNORDERED_MAP std::hash_map
 using std::hash_map;
+#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4
+#define UNORDERED_MAP std::tr1::unordered_map
 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
-#define HM_NAMESPACE __gnu_cxx
-using __gnu_cxx::hash_map;
+#define UNORDERED_MAP std::__gnu_cxx::hash_map
 
 namespace __gnu_cxx
@@ -60 +67 @@
 
 #else
-#define HM_NAMESPACE std
+#define UNORDERED_MAP std::hash_map
 using std::hash_map;
 #endif