From 3249986ba8d49108cc3b58a2db092ab940480ebf Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 16 Jul 2014 13:09:56 +0200 Subject: Buildsystem/GCC: Fixed release linking errors --- src/server/game/Battlegrounds/Battleground.cpp | 14 ++------------ src/server/game/Battlegrounds/Battleground.h | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 4f3bfa1a3c3..d17be29211a 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -560,7 +560,7 @@ inline void Battleground::_ProcessLeave(uint32 diff) } } -inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const +Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const { Player* player = NULL; if (!offlineRemove) @@ -573,17 +573,7 @@ inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char co return player; } -inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::iterator itr, char const* context) -{ - return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); -} - -inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::const_iterator itr, char const* context) const -{ - return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); -} - -inline Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const +Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const { Player* player = _GetPlayer(itr, context); if (player) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 46436b56f3c..481e0e18382 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -476,8 +476,8 @@ class Battleground void PlayerAddedToBGCheckIfBGIsRunning(Player* player); Player* _GetPlayer(uint64 guid, bool offlineRemove, const char* context) const; - Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context); - Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const; + Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context) { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); } + Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); } Player* _GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, const char* context) const; void _ProcessOfflineQueue(); -- cgit v1.2.3