josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[7810] Moved ZThread related code on ACE framework. Author: Ambal

Browse Source 
Remove ZThread source code from mangos.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-13 18:22:21 -05:00
parent 9dd5a1c6d7
commit 25e5c99dec
60 changed files with 489 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ObjectAccessor.h
+6 -6
View File
@@ -23,7 +23,7 @@
#include "Platform/Define.h"
#include "Policies/Singleton.h"
#include "zthread/FastMutex.h"
#include <ace/Thread_Mutex.h>
#include "Utilities/UnorderedMap.h"
#include "Policies/ThreadingModel.h"
@@ -51,8 +51,8 @@ class HashMapHolder
public:
typedef UNORDERED_MAP< uint64, T* > MapType;
typedef ZThread::FastMutex LockType;
typedef Trinity::GeneralLock<LockType > Guard;
typedef ACE_Thread_Mutex LockType;
typedef MaNGOS::GeneralLock<LockType > Guard;
static void Insert(T* o) { m_objectMap[o->GetGUID()] = o; }
@@ -80,7 +80,7 @@ class HashMapHolder
static MapType m_objectMap;
};
class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ZThread::FastMutex> >
class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
{
friend class Trinity::OperatorNew<ObjectAccessor>;
@@ -228,8 +228,8 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor
friend struct WorldObjectChangeAccumulator;
Player2CorpsesMapType i_player2corpse;
typedef ZThread::FastMutex LockType;
typedef Trinity::GeneralLock<LockType > Guard;
typedef ACE_Thread_Mutex LockType;
typedef MaNGOS::GeneralLock<LockType > Guard;
static void _buildChangeObjectForPlayer(WorldObject *, UpdateDataMapType &);
static void _buildPacket(Player *, Object *, UpdateDataMapType &);