Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dense_set: fix an issue when erasing movable keys

Browse Source
This commit is contained in:
Michele Caini
2022-07-13 11:24:40 +02:00
parent c26558cd6d
commit e8f8520251
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entt/container/dense_set.hpp
View File

@@ -279,8 +279,8 @@ class dense_set {
void move_and_pop(const std::size_t pos) {
if(const auto last = size() - 1u; pos != last) {
packed.first()[pos] = std::move(packed.first().back());
size_type *curr = sparse.first().data() + value_to_bucket(packed.first().back().second);
packed.first()[pos] = std::move(packed.first().back());
for(; *curr != last; curr = &packed.first()[*curr].first) {}
*curr = pos;
}

20
test/entt/container/dense_set.cpp
View File

@@ -2,6 +2,7 @@
#include <functional>
#include <iterator>
#include <memory>
#include <string>
#include <tuple>
#include <type_traits>
#include <utility>
@@ -543,6 +544,25 @@ TEST(DenseSet, Erase) {
ASSERT_EQ(set.size(), 0u);
}
TEST(DenseSet, EraseWithMovableKeyValue) {
// TODO
static constexpr std::size_t minimum_bucket_count = 8u;
entt::dense_set<std::string> set;
set.emplace("0");
set.emplace("1");
ASSERT_EQ(set.bucket_count(), minimum_bucket_count);
ASSERT_EQ(set.size(), 2u);
auto it = set.erase(set.find("0"));
ASSERT_EQ(*it, "1");
ASSERT_EQ(set.size(), 1u);
ASSERT_FALSE(set.contains("0"));
}
TEST(DenseSet, EraseFromBucket) {
static constexpr std::size_t minimum_bucket_count = 8u;
entt::dense_set<std::size_t, entt::identity> set;