From 25a401042a09658d74e4f5b2161ac4cfea021886 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 19 Jun 2023 10:13:22 +0200 Subject: [PATCH] registry: drop ::release (deprecated function) --- src/entt/entity/registry.hpp | 14 -------------- test/entt/entity/registry.cpp | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index 4cfbeb379..49c1592c0 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -534,20 +534,6 @@ public: entities.in_use(entities.size() - destroyed); } - /** - * @brief Releases an identifier. - * - * The version is updated and the identifier can be recycled at any time. - * - * @param entt A valid identifier. - * @return The version of the recycled entity. - */ - [[deprecated("use .orphan(entt) and .storage().erase(entt) instead")]] version_type release(const entity_type entt) { - ENTT_ASSERT(orphan(entt), "Non-orphan entity"); - entities.erase(entt); - return entities.current(entt); - } - /** * @brief Destroys an entity and releases its identifier. * diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp index ea3e70235..1941848e9 100644 --- a/test/entt/entity/registry.cpp +++ b/test/entt/entity/registry.cpp @@ -481,7 +481,7 @@ TEST(Registry, Identifiers) { ASSERT_EQ(traits_type::to_integral(pre), traits_type::to_entity(pre)); - registry.release(pre); + registry.destroy(pre); const auto post = registry.create(); ASSERT_NE(pre, post); @@ -503,9 +503,9 @@ TEST(Registry, CreateManyEntitiesAtOnce) { entt::entity entities[3]; const auto entity = registry.create(); - registry.release(registry.create()); - registry.release(entity); - registry.release(registry.create()); + registry.destroy(registry.create()); + registry.destroy(entity); + registry.destroy(registry.create()); registry.create(std::begin(entities), std::end(entities)); @@ -560,7 +560,7 @@ TEST(Registry, CreateWithHint) { ASSERT_TRUE(registry.valid(entt::entity{2})); ASSERT_EQ(e3, entt::entity{3}); - registry.release(e2); + registry.destroy(e2); ASSERT_EQ(traits_type::to_version(e2), 0u); ASSERT_EQ(registry.current(e2), 1u); @@ -574,8 +574,8 @@ TEST(Registry, CreateWithHint) { ASSERT_EQ(traits_type::to_entity(e1), 2u); ASSERT_EQ(traits_type::to_version(e1), 0u); - registry.release(e1); - registry.release(e2); + registry.destroy(e1); + registry.destroy(e2); auto e0 = registry.create(entt::entity{0}); ASSERT_EQ(e0, entt::entity{0}); @@ -628,7 +628,7 @@ TEST(Registry, CreateDestroyReleaseCornerCase) { const auto e1 = registry.create(); registry.destroy(e0); - registry.release(e1); + registry.storage().erase(e1); ASSERT_EQ(registry.storage().in_use(), 0u); @@ -1998,8 +1998,8 @@ TEST(Registry, AssignEntities) { entt::registry registry; entt::entity entities[3]; registry.create(std::begin(entities), std::end(entities)); - registry.release(entities[1]); - registry.release(entities[2]); + registry.destroy(entities[1]); + registry.destroy(entities[2]); entt::registry other; const auto *data = registry.storage().data();