Index: trunk/src/shared/Database/Database.h
===================================================================
--- trunk/src/shared/Database/Database.h (revision 173)
+++ trunk/src/shared/Database/Database.h (revision 206)
@@ -24,5 +24,5 @@
 #include "zthread/Thread.h"
 #include "../src/zthread/ThreadImpl.h"
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
 
@@ -31,6 +31,6 @@
 class SqlQueryHolder;
 
-typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues;
-typedef HM_NAMESPACE::hash_map<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues;
+typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlTransaction*> TransactionQueues;
+typedef UNORDERED_MAP<ZThread::ThreadImpl*, SqlResultQueue*> QueryQueues;
 
 #define MAX_QUERY_LEN   1024
Index: trunk/src/shared/Common.h
===================================================================
--- trunk/src/shared/Common.h (revision 112)
+++ trunk/src/shared/Common.h (revision 206)
@@ -84,5 +84,5 @@
 #endif                                                      // __GNUC__
 
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include <stdio.h>
 #include <stdlib.h>