Browse Source

storage: drop deprecated member in_use

Michele Caini 2 years ago
parent
commit
2f625b0a6f
2 changed files with 12 additions and 22 deletions
  1. 0 16
      src/entt/entity/storage.hpp
  2. 12 6
      test/entt/entity/storage_entity.cpp

+ 0 - 16
src/entt/entity/storage.hpp

@@ -1136,22 +1136,6 @@ public:
         return static_cast<size_type>(std::distance(first, last));
         return static_cast<size_type>(std::distance(first, last));
     }
     }
 
 
-    /**
-     * @brief Returns the number of elements considered still in use.
-     * @return The number of elements considered still in use.
-     */
-    [[deprecated("use free_list() instead")]] [[nodiscard]] size_type in_use() const noexcept {
-        return base_type::free_list();
-    }
-
-    /**
-     * @brief Sets the number of elements considered still in use.
-     * @param len The number of elements considered still in use.
-     */
-    [[deprecated("use free_list(len) instead")]] void in_use(const size_type len) noexcept {
-        base_type::free_list(len);
-    }
-
     /**
     /**
      * @brief Returns an iterable object to use to _visit_ a storage.
      * @brief Returns an iterable object to use to _visit_ a storage.
      *
      *

+ 12 - 6
test/entt/entity/storage_entity.cpp

@@ -290,23 +290,29 @@ TEST(StorageEntity, Pack) {
     ASSERT_EQ(it, pool.cend());
     ASSERT_EQ(it, pool.cend());
 }
 }
 
 
-TEST(StorageEntity, InUse) {
+TEST(StorageEntity, FreeList) {
     entt::storage<entt::entity> pool;
     entt::storage<entt::entity> pool;
 
 
     pool.emplace(entt::entity{0});
     pool.emplace(entt::entity{0});
 
 
-    ASSERT_EQ(pool.in_use(), 1u); // NOLINT
     ASSERT_EQ(pool.free_list(), 1u);
     ASSERT_EQ(pool.free_list(), 1u);
+    ASSERT_EQ(pool.begin(), pool.begin(0));
+    ASSERT_EQ(pool.end(), pool.end(0));
+    ASSERT_EQ(pool.size(), 1u);
 
 
-    pool.in_use(0u); // NOLINT
+    pool.free_list(0u);
 
 
-    ASSERT_EQ(pool.in_use(), 0u); // NOLINT
     ASSERT_EQ(pool.free_list(), 0u);
     ASSERT_EQ(pool.free_list(), 0u);
+    ASSERT_NE(pool.begin(), pool.begin(0));
+    ASSERT_EQ(pool.end(), pool.end(0));
+    ASSERT_EQ(pool.size(), 1u);
 
 
-    pool.in_use(1u); // NOLINT
+    pool.free_list(1u);
 
 
-    ASSERT_EQ(pool.in_use(), 1u); // NOLINT
     ASSERT_EQ(pool.free_list(), 1u);
     ASSERT_EQ(pool.free_list(), 1u);
+    ASSERT_EQ(pool.begin(), pool.begin(0));
+    ASSERT_EQ(pool.end(), pool.end(0));
+    ASSERT_EQ(pool.size(), 1u);
 }
 }
 
 
 ENTT_DEBUG_TEST(StorageEntityDeathTest, InUse) {
 ENTT_DEBUG_TEST(StorageEntityDeathTest, InUse) {