From 42fbcf2fc58690346ef1db12803b79634985d44f Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 6 Jan 2023 16:51:01 +0100 Subject: Core/Utils: Replace boost flat_set with our own --- src/common/Containers/FlatSet.h | 105 +++++++++++++++++++++++ src/server/game/Entities/Player/KillRewarder.cpp | 4 +- src/server/game/Entities/Unit/Unit.h | 4 +- src/server/game/Phasing/PhaseShift.h | 4 +- src/server/game/Phasing/PhasingHandler.cpp | 3 +- src/server/game/Spells/SpellInfo.cpp | 10 +-- 6 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 src/common/Containers/FlatSet.h (limited to 'src') diff --git a/src/common/Containers/FlatSet.h b/src/common/Containers/FlatSet.h new file mode 100644 index 00000000000..5602ba17254 --- /dev/null +++ b/src/common/Containers/FlatSet.h @@ -0,0 +1,105 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ +#ifndef TRINITYCORE_FLAT_SET_H +#define TRINITYCORE_FLAT_SET_H + +#include +#include + +namespace Trinity::Containers +{ +template , class KeyContainer = std::vector> +class FlatSet +{ +public: + using iterator = typename KeyContainer::iterator; + using const_iterator = typename KeyContainer::const_iterator; + + bool empty() const { return _storage.empty(); } + auto size() const { return _storage.size(); } + + auto begin() { return _storage.begin(); } + auto begin() const { return _storage.begin(); } + + auto end() { return _storage.end(); } + auto end() const { return _storage.end(); } + + auto find(Key const& value) const + { + auto end = this->end(); + auto itr = std::lower_bound(this->begin(), end, value, Compare()); + if (itr != end && Compare()(value, *itr)) + itr = end; + + return itr; + } + + auto find(Key const& value) + { + auto end = this->end(); + auto itr = std::lower_bound(this->begin(), end, value, Compare()); + if (itr != end && Compare()(value, *itr)) + itr = end; + + return itr; + } + + template + std::pair emplace(Args&&... args) + { + Key newElement(std::forward(args)...); + auto end = this->end(); + auto itr = std::lower_bound(this->begin(), end, newElement, Compare()); + if (itr != end && !Compare()(newElement, *itr)) + return { itr, false }; + + return { _storage.emplace(itr, std::move(newElement)), true }; + } + + std::pair insert(Key const& key) { return emplace(key); } + + std::size_t erase(Key const& key) + { + auto itr = this->find(key); + if (itr == this->end()) + return 0; + + this->erase(itr); + return 1; + } + auto erase(const_iterator itr) { return _storage.erase(itr); } + + void clear() { _storage.clear(); } + + void shrink_to_fit() { _storage.shrink_to_fit(); } + + friend bool operator==(FlatSet const& left, FlatSet const& right) + { + return left._storage == right._storage; + } + + friend bool operator!=(FlatSet const& left, FlatSet const& right) + { + return !(left == right); + } + +private: + KeyContainer _storage; +}; +} + +#endif // TRINITYCORE_FLAT_SET_H diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index e2acc7eb515..5f352fba290 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -18,6 +18,7 @@ #include "KillRewarder.h" #include "Creature.h" #include "DB2Stores.h" +#include "FlatSet.h" #include "Formulas.h" #include "Group.h" #include "Guild.h" @@ -27,7 +28,6 @@ #include "Player.h" #include "Scenario.h" #include "SpellAuraEffects.h" -#include #include // == KillRewarder ==================================================== @@ -259,7 +259,7 @@ void KillRewarder::_RewardGroup(Group const* group, Player const* killer) void KillRewarder::Reward() { - boost::container::flat_set, boost::container::small_vector> processedGroups; + Trinity::Containers::FlatSet, boost::container::small_vector> processedGroups; for (Player* killer : _killers) { _InitGroupData(killer); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 380b1edc523..c15246784b2 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -20,12 +20,12 @@ #include "Object.h" #include "CombatManager.h" +#include "FlatSet.h" #include "SpellAuraDefines.h" #include "ThreatManager.h" #include "Timer.h" #include "UnitDefines.h" #include "Util.h" -#include #include #include #include @@ -1964,7 +1964,7 @@ class TC_GAME_API Unit : public WorldObject bool m_canModifyStats; VisibleAuraContainer m_visibleAuras; - boost::container::flat_set m_visibleAurasToUpdate; + Trinity::Containers::FlatSet m_visibleAurasToUpdate; float m_speed_rate[MAX_MOVE_TYPE]; diff --git a/src/server/game/Phasing/PhaseShift.h b/src/server/game/Phasing/PhaseShift.h index 7d483ce12a9..89f5ad98896 100644 --- a/src/server/game/Phasing/PhaseShift.h +++ b/src/server/game/Phasing/PhaseShift.h @@ -20,8 +20,8 @@ #include "Define.h" #include "EnumFlag.h" +#include "FlatSet.h" #include "ObjectGuid.h" -#include #include class PhasingHandler; @@ -82,7 +82,7 @@ public: typename Container::iterator Iterator; bool Erased; }; - using PhaseContainer = boost::container::flat_set; + using PhaseContainer = Trinity::Containers::FlatSet; using VisibleMapIdContainer = std::map; using UiMapPhaseIdContainer = std::map; diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp index ad2395fcb21..5521d7f0d57 100644 --- a/src/server/game/Phasing/PhasingHandler.cpp +++ b/src/server/game/Phasing/PhasingHandler.cpp @@ -31,7 +31,6 @@ #include "SpellAuraEffects.h" #include "TerrainMgr.h" #include "Vehicle.h" -#include #include #include @@ -91,7 +90,7 @@ public: } private: - boost::container::flat_set, boost::container::small_vector> _visited; + Trinity::Containers::FlatSet, boost::container::small_vector> _visited; }; void PhasingHandler::AddPhase(WorldObject* object, uint32 phaseId, bool updateVisibility) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index cd453b197ff..84415fe2720 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -20,6 +20,7 @@ #include "Containers.h" #include "Corpse.h" #include "DB2Stores.h" +#include "FlatSet.h" #include "GameTables.h" #include "InstanceScript.h" #include "Item.h" @@ -35,7 +36,6 @@ #include "SpellAuraEffects.h" #include "SpellMgr.h" #include "Vehicle.h" -#include #include uint32 GetTargetFlagMask(SpellTargetObjectTypes objType) @@ -234,8 +234,8 @@ struct SpellEffectInfo::ImmunityInfo uint32 DispelImmune = 0; uint32 DamageSchoolMask = 0; - boost::container::flat_set AuraTypeImmune; - boost::container::flat_set SpellEffectImmune; + Trinity::Containers::FlatSet AuraTypeImmune; + Trinity::Containers::FlatSet SpellEffectImmune; }; std::array SpellImplicitTargetInfo::_data = @@ -3684,7 +3684,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf continue; auto spellImmuneItr = immuneInfo->SpellEffectImmune.find(auraSpellEffectInfo.Effect); - if (spellImmuneItr == immuneInfo->SpellEffectImmune.cend()) + if (spellImmuneItr == immuneInfo->SpellEffectImmune.end()) { immuneToAllEffects = false; break; @@ -3705,7 +3705,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf { bool isImmuneToAuraEffectApply = false; auto auraImmuneItr = immuneInfo->AuraTypeImmune.find(auraName); - if (auraImmuneItr != immuneInfo->AuraTypeImmune.cend()) + if (auraImmuneItr != immuneInfo->AuraTypeImmune.end()) isImmuneToAuraEffectApply = true; if (!isImmuneToAuraEffectApply && !auraSpellInfo->IsPositiveEffect(auraSpellEffectInfo.EffectIndex) && !auraSpellInfo->HasAttribute(SPELL_ATTR2_NO_SCHOOL_IMMUNITIES)) -- cgit v1.2.3