aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapManager.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-05-15 18:00:50 +0200
committerQAston <none@none>2009-05-15 18:00:50 +0200
commita796012723dd2410a150264a4f32f00bc570ef76 (patch)
treed55cada7db3c9c752815c79d9d164069acd99edc /src/game/MapManager.cpp
parentae461a4158d6376e28e7bc53d3f7ad5690a5064e (diff)
parentad92f5e210b7a2c0584cdabd30560fe723d160be (diff)
*Merge some fixes from tc1
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapManager.cpp')
-rw-r--r--src/game/MapManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 061e0252a13..d75ba22b19a 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -34,9 +34,9 @@
#include "ObjectMgr.h"
#include "Language.h"
-#define CLASS_LOCK Trinity::ClassLevelLockable<MapManager, ZThread::Mutex>
+#define CLASS_LOCK MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex>
INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(MapManager, ZThread::Mutex);
+INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Thread_Mutex);
extern GridState* si_GridStates[]; // debugging code, should be deleted some day