diff --git a/src/common/Define.h b/src/common/Define.h index 2678df1bd..8f838b2db 100644 --- a/src/common/Define.h +++ b/src/common/Define.h @@ -104,8 +104,6 @@ #define SZFMTD "%" PRIuPTR -#define UNUSED(x) (void)(x) - typedef std::int64_t int64; typedef std::int32_t int32; typedef std::int16_t int16; diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index bddba7d82..e376a68af 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -61,7 +61,7 @@ inline std::string ReadSkip(std::istringstream& iss, char term) inline bool CheckDelimiter(std::istringstream& iss, char delimiter, const char* context) { - UNUSED(context); // used only with EXTRA_LOGS + (void)context; // used only with EXTRA_LOGS char c = iss.peek(); if (c != delimiter) { diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index fd5cb2d52..b044c04b3 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -179,8 +179,8 @@ namespace lfg void LFGGroupScript::OnRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, char const* reason) { // used only with EXTRA_LOGS - UNUSED(kicker); - UNUSED(reason); + (void)kicker; + (void)reason; if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER)) return; @@ -280,7 +280,7 @@ namespace lfg void LFGGroupScript::OnInviteMember(Group* group, ObjectGuid guid) { // used only with EXTRA_LOGS - UNUSED(guid); + (void)guid; if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER)) return; diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 8e7f3bfad..4d414957d 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -812,7 +812,7 @@ void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recvData) void WorldSession::HandleChannelDeclineInvite(WorldPacket& recvPacket) { // used only with EXTRA_LOGS - UNUSED(recvPacket); + (void)recvPacket; #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) LOG_DEBUG("network", "Opcode %u", recvPacket.GetOpcode()); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 50ad2e330..9a7ed0b0a 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6812,7 +6812,7 @@ void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId)) { // used only with EXTRA_LOGS - UNUSED(triggeredSpellInfo); + (void)triggeredSpellInfo; int32 basepoints0 = GetAmount(); #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)