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/MapUpdater.cpp | |
| parent | 8ba790ef35e596424a5240d3334f1c0f5afb2c86 (diff) | |
Change more ace_guard to trinity_guard
Diffstat (limited to 'src/server/game/Maps/MapUpdater.cpp')
| -rw-r--r-- | src/server/game/Maps/MapUpdater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 7e6b2f03bd0..80025680753 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -81,7 +81,7 @@ int MapUpdater::deactivate() int MapUpdater::wait() { - ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_mutex, -1); + TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); while (pending_requests > 0) m_condition.wait(); @@ -91,7 +91,7 @@ int MapUpdater::wait() int MapUpdater::schedule_update(Map& map, ACE_UINT32 diff) { - ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_mutex, -1); + TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); ++pending_requests; @@ -113,7 +113,7 @@ bool MapUpdater::activated() void MapUpdater::update_finished() { - ACE_GUARD(ACE_Thread_Mutex, guard, m_mutex); + TRINITY_GUARD(ACE_Thread_Mutex, m_mutex); if (pending_requests == 0) { |