Core/Utils: Replace boost flat_set with our own

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 <http://www.gnu.org/licenses/>.
+ */
+#ifndef TRINITYCORE_FLAT_SET_H
+#define TRINITYCORE_FLAT_SET_H
+
+#include <functional>
+#include <vector>
+
+namespace Trinity::Containers
+{
+template <class Key, class Compare = std::less<Key>, class KeyContainer = std::vector<Key>>
+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 <class... Args>
+    std::pair<iterator, bool> emplace(Args&&... args)
+    {
+        Key newElement(std::forward<Args>(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<iterator, bool> 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

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 <boost/container/flat_set.hpp>
 #include <boost/container/small_vector.hpp>
 
  // == KillRewarder ====================================================
@@ -259,7 +259,7 @@ void KillRewarder::_RewardGroup(Group const* group, Player const* killer)
 
 void KillRewarder::Reward()
 {
-    boost::container::flat_set<Group const*, std::less<>, boost::container::small_vector<Group const*, 3>> processedGroups;
+    Trinity::Containers::FlatSet<Group const*, std::less<>, boost::container::small_vector<Group const*, 3>> processedGroups;
     for (Player* killer : _killers)
     {
         _InitGroupData(killer);

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 <boost/container/flat_set.hpp>
 #include <array>
 #include <map>
 #include <stack>
@@ -1964,7 +1964,7 @@ class TC_GAME_API Unit : public WorldObject
         bool m_canModifyStats;
 
         VisibleAuraContainer m_visibleAuras;
-        boost::container::flat_set<AuraApplication*, VisibleAuraSlotCompare> m_visibleAurasToUpdate;
+        Trinity::Containers::FlatSet<AuraApplication*, VisibleAuraSlotCompare> m_visibleAurasToUpdate;
 
         float m_speed_rate[MAX_MOVE_TYPE];
 

src/server/game/Phasing/PhaseShift.h

@@ -20,8 +20,8 @@
 
 #include "Define.h"
 #include "EnumFlag.h"
+#include "FlatSet.h"
 #include "ObjectGuid.h"
-#include <boost/container/flat_set.hpp>
 #include <map>
 
 class PhasingHandler;
@@ -82,7 +82,7 @@ public:
         typename Container::iterator Iterator;
         bool Erased;
     };
-    using PhaseContainer = boost::container::flat_set<PhaseRef>;
+    using PhaseContainer = Trinity::Containers::FlatSet<PhaseRef>;
     using VisibleMapIdContainer = std::map<uint32, VisibleMapIdRef>;
     using UiMapPhaseIdContainer = std::map<uint32, UiMapPhaseIdRef>;
 

src/server/game/Phasing/PhasingHandler.cpp

@@ -31,7 +31,6 @@
 #include "SpellAuraEffects.h"
 #include "TerrainMgr.h"
 #include "Vehicle.h"
-#include <boost/container/flat_set.hpp>
 #include <boost/container/small_vector.hpp>
 #include <sstream>
 
@@ -91,7 +90,7 @@ public:
     }
 
 private:
-    boost::container::flat_set<WorldObject*, std::less<WorldObject*>, boost::container::small_vector<WorldObject*, 8>> _visited;
+    Trinity::Containers::FlatSet<WorldObject*, std::less<WorldObject*>, boost::container::small_vector<WorldObject*, 8>> _visited;
 };
 
 void PhasingHandler::AddPhase(WorldObject* object, uint32 phaseId, bool updateVisibility)

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 <boost/container/flat_set.hpp>
 #include <G3D/g3dmath.h>
 
 uint32 GetTargetFlagMask(SpellTargetObjectTypes objType)
@@ -234,8 +234,8 @@ struct SpellEffectInfo::ImmunityInfo
     uint32 DispelImmune = 0;
     uint32 DamageSchoolMask = 0;
 
-    boost::container::flat_set<AuraType> AuraTypeImmune;
-    boost::container::flat_set<SpellEffectName> SpellEffectImmune;
+    Trinity::Containers::FlatSet<AuraType> AuraTypeImmune;
+    Trinity::Containers::FlatSet<SpellEffectName> SpellEffectImmune;
 };
 
 std::array<SpellImplicitTargetInfo::StaticData, TOTAL_SPELL_TARGETS> 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))

tests/common/FlatSet.cpp

@@ -0,0 +1,60 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "tc_catch2.h"
+
+#include "FlatSet.h"
+
+TEST_CASE("Insertion", "[FlatSet]")
+{
+    Trinity::Containers::FlatSet<int> flat;
+
+    REQUIRE(flat.insert(5).second == true);
+    REQUIRE(flat.insert(3).second == true);
+    REQUIRE(flat.insert(9).second == true);
+    REQUIRE(flat.insert(7).second == true);
+
+    REQUIRE(flat.insert(5).second == false);
+    REQUIRE(flat.insert(3).second == false);
+    REQUIRE(flat.insert(9).second == false);
+    REQUIRE(flat.insert(7).second == false);
+
+    REQUIRE(flat.size() == 4);
+
+    auto itr = flat.begin();
+    REQUIRE(*itr == 3);
+    ++itr;
+    REQUIRE(*itr == 5);
+    ++itr;
+    REQUIRE(*itr == 7);
+    ++itr;
+    REQUIRE(*itr == 9);
+    ++itr;
+    REQUIRE(itr == flat.end());
+}
+
+TEST_CASE("Erase", "[FlatSet]")
+{
+    Trinity::Containers::FlatSet<int> flat;
+    flat.insert(3);
+    flat.insert(5);
+    flat.insert(7);
+    flat.insert(9);
+
+    REQUIRE(flat.erase(7) == 1);
+    REQUIRE(flat.size() == 3);
+}