diff options
author | megamage <none@none.none> | 2011-11-08 10:48:49 -0500 |
---|---|---|
committer | megamage <none@none.none> | 2011-11-08 10:48:49 -0500 |
commit | 462a2b987605d8df036424fc0fb1f93d00df15f2 (patch) | |
tree | 92c0c4d0c07d87a30443fac48002f0eebe4e2406 /src/server/game/Maps/MapManager.cpp | |
parent | 8ba790ef35e596424a5240d3334f1c0f5afb2c86 (diff) |
Change more ace_guard to trinity_guard
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
-rwxr-xr-x | src/server/game/Maps/MapManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 8b1c69362f2..78aeb32ab2d 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -101,7 +101,7 @@ Map* MapManager::_createBaseMap(uint32 id) if (m == NULL) { - ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL); + TRINITY_GUARD(ACE_Thread_Mutex, Lock); const MapEntry* entry = sMapStore.LookupEntry(id); if (entry && entry->Instanceable()) @@ -335,7 +335,7 @@ void MapManager::UnloadAll() uint32 MapManager::GetNumInstances() { - ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0); + TRINITY_GUARD(ACE_Thread_Mutex, Lock); uint32 ret = 0; for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) @@ -352,7 +352,7 @@ uint32 MapManager::GetNumInstances() uint32 MapManager::GetNumPlayersInInstances() { - ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0); + TRINITY_GUARD(ACE_Thread_Mutex, Lock); uint32 ret = 0; for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) |