Преглед изворни кода

dense_set: fix an issue when erasing movable keys

Michele Caini пре 3 година
родитељ
комит
e8f8520251
2 измењених фајлова са 21 додато и 1 уклоњено
  1. 1 1
      src/entt/container/dense_set.hpp
  2. 20 0
      test/entt/container/dense_set.cpp

+ 1 - 1
src/entt/container/dense_set.hpp

@@ -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 - 0
test/entt/container/dense_set.cpp

@@ -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;