From 43c3f08fe2d31693fc58f437b7262b3846d4a2b5 Mon Sep 17 00:00:00 2001 From: H0zen Date: Wed, 5 Jun 2019 13:47:26 +0300 Subject: [PATCH] Fix MaNGOS build --- GlobalMethods.h | 4 +--- GuildMethods.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/GlobalMethods.h b/GlobalMethods.h index 39cc6f0..ef2fc0d 100644 --- a/GlobalMethods.h +++ b/GlobalMethods.h @@ -167,7 +167,7 @@ namespace LuaGlobalFunctions int tbl = lua_gettop(L); uint32 i = 0; -#if defined(MANGOS) && defined(CLASSIC) +#if defined(MANGOS) eObjectAccessor()DoForAllPlayers([&](Player* player){ if(player->IsInWorld()) { @@ -184,8 +184,6 @@ namespace LuaGlobalFunctions boost::shared_lock lock(*HashMapHolder::GetLock()); #elif defined(AZEROTHCORE) TRINITY_READ_GUARD(HashMapHolder::LockType, *HashMapHolder::GetLock()); -#elif defined(MANGOS) && !defined(CLASSIC) - ACE_READ_GUARD_RETURN(HashMapHolder::LockType, g, HashMapHolder::GetLock(), 0) #else HashMapHolder::ReadGuard g(HashMapHolder::GetLock()); #endif diff --git a/GuildMethods.h b/GuildMethods.h index 5953d7a..e8dab6f 100644 --- a/GuildMethods.h +++ b/GuildMethods.h @@ -25,7 +25,7 @@ namespace LuaGuild int tbl = lua_gettop(L); uint32 i = 0; -#if defined(MANGOS) && defined(CLASSIC) +#if defined(MANGOS) eObjectAccessor()DoForAllPlayers([&](Player* player) { if (player->IsInWorld() && player->GetGuildId() == guild->GetId()) @@ -40,8 +40,6 @@ namespace LuaGuild boost::shared_lock lock(*HashMapHolder::GetLock()); #elif defined(AZEROTHCORE) TRINITY_READ_GUARD(HashMapHolder::LockType, *HashMapHolder::GetLock()); -#elif defined(MANGOS) && !defined(CLASSIC) - ACE_READ_GUARD_RETURN(HashMapHolder::LockType, g, HashMapHolder::GetLock(), 0) #else HashMapHolder::ReadGuard g(HashMapHolder::GetLock()); #endif