diff options
author | jackpoz <giacomopoz@gmail.com> | 2019-10-13 19:27:08 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-18 22:51:50 +0100 |
commit | d5d04a6c551700665db77770ff0e7cca7e48d631 (patch) | |
tree | 48cef3e95cdd3a8a6d3d29bf593d84cc16c99f49 /src | |
parent | 4a47e1c6be02608d8df2ec1b6267a31dcd0c41fa (diff) |
Core/Misc: Fix C++17 build errors
(cherry picked from commit 30823f9b79b4ad16f96e90692a900f68a7f63c0a)
Diffstat (limited to 'src')
12 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 6c4dcdba7d7..0ddc35613fb 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -54,7 +54,7 @@ LootStore LootTemplates_Skinning("skinning_loot_template", "creature s LootStore LootTemplates_Spell("spell_loot_template", "spell id (random item creating)", false); // Selects invalid loot items to be removed from group possible entries (before rolling) -struct LootGroupInvalidSelector : public std::unary_function<LootStoreItem*, bool> +struct LootGroupInvalidSelector { explicit LootGroupInvalidSelector(Loot const& loot, uint16 lootMode) : _loot(loot), _lootMode(lootMode) { } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index f616da3f9a1..c97e12fe366 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -205,7 +205,7 @@ class npc_eyestalk : public CreatureScript } }; -class FocusedFireTargetSelector : public std::unary_function<Unit *, bool> +class FocusedFireTargetSelector { public: FocusedFireTargetSelector(Creature* me, const Unit* victim) : _me(me), _victim(victim) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 98bb8501173..37bee53d4bb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -548,7 +548,7 @@ class spell_mandokir_spirit_vengeance_cancel : public SpellScriptLoader } }; -class DevastatingSlamTargetSelector : public std::unary_function<Unit *, bool> +class DevastatingSlamTargetSelector { public: DevastatingSlamTargetSelector(Creature* me, const Unit* victim) : _me(me), _victim(victim) {} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 11b36eda06b..628dfccaccb 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -112,7 +112,7 @@ enum Spells SPELL_WAKING_NIGHTMARE_H = 67677 }; -class OrientationCheck : public std::unary_function<Unit*, bool> +class OrientationCheck { public: explicit OrientationCheck(Unit* _caster) : caster(_caster) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 3edb8f86a61..44e852a129c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -103,7 +103,7 @@ enum Actions ACTION_TALK_ENTER_ZONE = 2 }; -class BoneSpikeTargetSelector : public std::unary_function<Unit*, bool> +class BoneSpikeTargetSelector { public: BoneSpikeTargetSelector(UnitAI* ai) : _ai(ai) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 459db94588d..fc3fbdff08a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -362,7 +362,7 @@ enum Misc DATA_VILE = 45814622 }; -class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> +class NecroticPlagueTargetCheck { public: NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1 = 0, uint32 notAura2 = 0) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index f6f849245d6..702d9bf2a60 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -157,7 +157,7 @@ enum Misc Position const ValithriaSpawnPos = {4210.813f, 2484.443f, 364.9558f, 0.01745329f}; -struct ManaVoidSelector : public std::unary_function<Unit*, bool> +struct ManaVoidSelector { explicit ManaVoidSelector(WorldObject const* source) : _source(source) { } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 2e6c332192d..f568aa836b7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -197,7 +197,7 @@ class KelThuzadCharmedPlayerAI : public SimpleCharmedPlayerAI } }; -struct ManaUserTargetSelector : public std::unary_function<Unit*, bool> +struct ManaUserTargetSelector { bool operator()(Unit const* target) const { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index e167932a7b4..dc12169d44b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -72,7 +72,7 @@ enum Events const float WEB_WRAP_MOVE_SPEED = 20.0f; -struct WebTargetSelector : public std::unary_function<Unit*, bool> +struct WebTargetSelector { WebTargetSelector(Unit* maexxna) : _maexxna(maexxna) {} bool operator()(Unit const* target) const diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index bb56e6fb903..0f4c032ccce 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -362,7 +362,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit*, bool> +class StoneGripTargetSelector { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) { } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 98ca41b064e..8efacb2e4af 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -450,7 +450,7 @@ private: Unit* _owner; }; -class ChargeTargetSelector : public std::unary_function<Unit*, bool> +class ChargeTargetSelector { public: ChargeTargetSelector() { } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index e9584db529e..dc4cd779188 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -295,7 +295,7 @@ private: uint32 _bossId; }; -class HammerTargetSelector : public std::unary_function<Unit*, bool> +class HammerTargetSelector { public: HammerTargetSelector(Unit const* unit) : _me(unit) { } |