Replaced mutex related code in Common.h

This commit is contained in:
leak committed 2014-06-08 15:30:57 +02:00
1 parent 0fa3a4923e
commit ee4a3b9d59
19 files changed
+142 -100

No files matched your search

+3 -3
View File
@@ -68,7 +68,7 @@ Map* MapManager::CreateBaseMap(uint32 id)
if (map == NULL)
{
TRINITY_GUARD(ACE_Thread_Mutex, Lock);
std::lock_guard<std::mutex> lock(_mapsLock);
MapEntry const* entry = sMapStore.LookupEntry(id);
ASSERT(entry);
@@ -302,7 +302,7 @@ void MapManager::UnloadAll()
uint32 MapManager::GetNumInstances()
{
TRINITY_GUARD(ACE_Thread_Mutex, Lock);
std::lock_guard<std::mutex> lock(_mapsLock);
uint32 ret = 0;
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
@@ -319,7 +319,7 @@ uint32 MapManager::GetNumInstances()
uint32 MapManager::GetNumPlayersInInstances()
{
TRINITY_GUARD(ACE_Thread_Mutex, Lock);
std::lock_guard<std::mutex> lock(_mapsLock);
uint32 ret = 0;
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)