yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MaNGOS build

Browse Source
This commit is contained in:
H0zen
2019-06-05 13:47:26 +03:00
parent cffcfe1e26
commit 43c3f08fe2
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GlobalMethods.h
View File

@@ -167,7 +167,7 @@ namespace LuaGlobalFunctions
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 i = 0; uint32 i = 0;
#if defined(MANGOS) && defined(CLASSIC) #if defined(MANGOS)
eObjectAccessor()DoForAllPlayers([&](Player* player){ eObjectAccessor()DoForAllPlayers([&](Player* player){
if(player->IsInWorld()) if(player->IsInWorld())
{ {
@@ -184,8 +184,6 @@ namespace LuaGlobalFunctions
boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
#elif defined(AZEROTHCORE) #elif defined(AZEROTHCORE)
TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
#elif defined(MANGOS) && !defined(CLASSIC)
ACE_READ_GUARD_RETURN(HashMapHolder<Player>::LockType, g, HashMapHolder<Player>::GetLock(), 0)
#else #else
HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
#endif #endif

4
GuildMethods.h
View File

@@ -25,7 +25,7 @@ namespace LuaGuild
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 i = 0; uint32 i = 0;
#if defined(MANGOS) && defined(CLASSIC) #if defined(MANGOS)
eObjectAccessor()DoForAllPlayers([&](Player* player) eObjectAccessor()DoForAllPlayers([&](Player* player)
{ {
if (player->IsInWorld() && player->GetGuildId() == guild->GetId()) if (player->IsInWorld() && player->GetGuildId() == guild->GetId())
@@ -40,8 +40,6 @@ namespace LuaGuild
boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
#elif defined(AZEROTHCORE) #elif defined(AZEROTHCORE)
TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock()); TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
#elif defined(MANGOS) && !defined(CLASSIC)
ACE_READ_GUARD_RETURN(HashMapHolder<Player>::LockType, g, HashMapHolder<Player>::GetLock(), 0)
#else #else
HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
#endif #endif