aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-01-06 16:51:01 +0100
committerShauren <shauren.trinity@gmail.com>2023-08-12 17:56:15 +0200
commit30adff16ae8806b7d5df824b6d3fdd331f7ff233 (patch)
tree4b366146da55a8b902ff454da25952bab81656ac
parentb8dc87a0e03123e0b37d1940a20424d703053ffe (diff)
Core/Utils: Replace boost flat_set with our own
(cherry picked from commit 42fbcf2fc58690346ef1db12803b79634985d44f)
-rw-r--r--src/common/Containers/FlatSet.h105
-rw-r--r--src/server/game/Spells/SpellInfo.cpp10
-rw-r--r--tests/common/FlatSet.cpp60
3 files changed, 170 insertions, 5 deletions
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 <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
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index dd3c8ede288..1cd54720d54 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -20,6 +20,7 @@
#include "Corpse.h"
#include "Creature.h"
#include "DBCStores.h"
+#include "FlatSet.h"
#include "Item.h"
#include "ItemTemplate.h"
#include "Log.h"
@@ -30,7 +31,6 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Vehicle.h"
-#include <boost/container/flat_set.hpp>
uint32 GetTargetFlagMask(SpellTargetObjectTypes objType)
{
@@ -228,8 +228,8 @@ struct SpellEffectInfo::ImmunityInfo
uint32 DispelImmune = 0;
uint32 DamageSchoolMask = 0;
- boost::container::flat_set<AuraType> AuraTypeImmune;
- boost::container::flat_set<SpellEffects> SpellEffectImmune;
+ Trinity::Containers::FlatSet<AuraType> AuraTypeImmune;
+ Trinity::Containers::FlatSet<SpellEffects> SpellEffectImmune;
};
std::array<SpellImplicitTargetInfo::StaticData, TOTAL_SPELL_TARGETS> SpellImplicitTargetInfo::_data =
@@ -3004,7 +3004,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;
@@ -3025,7 +3025,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_UNAFFECTED_BY_AURA_SCHOOL_IMMUNE))
diff --git a/tests/common/FlatSet.cpp b/tests/common/FlatSet.cpp
new file mode 100644
index 00000000000..a0c50a62a45
--- /dev/null
+++ b/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);
+}