From 2f625b0a6fbb3736fe00b6d72efb5684f09e4aeb Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 24 Jan 2024 08:12:07 +0100 Subject: [PATCH] storage: drop deprecated member in_use --- src/entt/entity/storage.hpp | 16 ---------------- test/entt/entity/storage_entity.cpp | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp index 4d01e70ac..46275c611 100644 --- a/src/entt/entity/storage.hpp +++ b/src/entt/entity/storage.hpp @@ -1136,22 +1136,6 @@ public: return static_cast(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. * diff --git a/test/entt/entity/storage_entity.cpp b/test/entt/entity/storage_entity.cpp index cda81e151..1ce71e2cb 100644 --- a/test/entt/entity/storage_entity.cpp +++ b/test/entt/entity/storage_entity.cpp @@ -290,23 +290,29 @@ TEST(StorageEntity, Pack) { ASSERT_EQ(it, pool.cend()); } -TEST(StorageEntity, InUse) { +TEST(StorageEntity, FreeList) { entt::storage pool; pool.emplace(entt::entity{0}); - ASSERT_EQ(pool.in_use(), 1u); // NOLINT 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_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.begin(), pool.begin(0)); + ASSERT_EQ(pool.end(), pool.end(0)); + ASSERT_EQ(pool.size(), 1u); } ENTT_DEBUG_TEST(StorageEntityDeathTest, InUse) {