From 25e5c99dec793dfcc45a41873af1760392ee8844 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 13 May 2009 18:22:21 -0500 Subject: [7810] Moved ZThread related code on ACE framework. Author: Ambal Remove ZThread source code from mangos. --HG-- branch : trunk --- src/game/ObjectAccessor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game/ObjectAccessor.cpp') diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 1fa0bd6d1ca..da6279e068a 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -41,9 +41,9 @@ #include -#define CLASS_LOCK Trinity::ClassLevelLockable +#define CLASS_LOCK MaNGOS::ClassLevelLockable INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK); -INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ZThread::FastMutex); +INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex); ObjectAccessor::ObjectAccessor() {} ObjectAccessor::~ObjectAccessor() {} @@ -470,7 +470,7 @@ ObjectAccessor::UpdateObjectVisibility(WorldObject *obj) /// Define the static member of HashMapHolder template UNORDERED_MAP< uint64, T* > HashMapHolder::m_objectMap; -template ZThread::FastMutex HashMapHolder::i_lock; +template ACE_Thread_Mutex HashMapHolder::i_lock; /// Global definitions for the hashmap storage -- cgit v1.2.3