aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Instances
diff options
context:
space:
mode:
authormegamage <none@none.none>2011-11-08 10:48:49 -0500
committermegamage <none@none.none>2011-11-08 10:48:49 -0500
commit462a2b987605d8df036424fc0fb1f93d00df15f2 (patch)
tree92c0c4d0c07d87a30443fac48002f0eebe4e2406 /src/server/game/Instances
parent8ba790ef35e596424a5240d3334f1c0f5afb2c86 (diff)
Change more ace_guard to trinity_guard
Diffstat (limited to 'src/server/game/Instances')
-rwxr-xr-xsrc/server/game/Instances/InstanceSaveMgr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index dec50e40127..b4e97f40f87 100755
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -80,8 +80,8 @@ class InstanceSave
/* online players bound to the instance (perm/solo)
does not include the members of the group unless they have permanent saves */
- void AddPlayer(Player* player) { ACE_GUARD(ACE_Thread_Mutex, guard, _lock); m_playerList.push_back(player); }
- bool RemovePlayer(Player* player) { ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, _lock, false); m_playerList.remove(player); return UnloadIfEmpty(); }
+ void AddPlayer(Player* player) { TRINITY_GUARD(ACE_Thread_Mutex, _lock); m_playerList.push_back(player); }
+ bool RemovePlayer(Player* player) { TRINITY_GUARD(ACE_Thread_Mutex, _lock); m_playerList.remove(player); return UnloadIfEmpty(); }
/* all groups bound to the instance */
void AddGroup(Group* group) { m_groupList.push_back(group); }
bool RemoveGroup(Group* group) { m_groupList.remove(group); return UnloadIfEmpty(); }