diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-04-23 15:53:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-04-23 15:53:48 +0200 |
| commit | 8898db8b272cc3745a76f4cd284912866ca884c5 (patch) | |
| tree | 4c497fcf6bd68651907cd77c7e7e61e58d47a171 /src/server/game/Maps/MapManager.cpp | |
| parent | a2a751b9d6ee3a86045cca2e1444499bd290708b (diff) | |
Core: Corrected NULL usage, it should only be used with pointers, not integers
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rwxr-xr-x | src/server/game/Maps/MapManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 7d880ad89e8..6759ca950ad 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -328,7 +328,7 @@ void MapManager::UnloadAll() uint32 MapManager::GetNumInstances() { - ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL); + ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0); uint32 ret = 0; for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) @@ -345,7 +345,7 @@ uint32 MapManager::GetNumInstances() uint32 MapManager::GetNumPlayersInInstances() { - ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL); + ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0); uint32 ret = 0; for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) |