Răsfoiți Sursa

registry: drop ::alive (deprecated function)

Michele Caini 2 ani în urmă
părinte
comite
cd3474e5b5
2 a modificat fișierele cu 3 adăugiri și 14 ștergeri
  1. 0 8
      src/entt/entity/registry.hpp
  2. 3 6
      test/entt/entity/registry.cpp

+ 0 - 8
src/entt/entity/registry.hpp

@@ -456,14 +456,6 @@ public:
         return assure<Type>(id);
     }
 
-    /**
-     * @brief Returns the number of entities still in use.
-     * @return Number of entities still in use.
-     */
-    [[deprecated("use .storage<Entity>().in_use() instead")]] [[nodiscard]] size_type alive() const {
-        return entities.in_use();
-    }
-
     /**
      * @brief Increases the capacity (number of entities) of the registry.
      * @param cap Desired capacity.

+ 3 - 6
test/entt/entity/registry.cpp

@@ -242,7 +242,7 @@ TEST(Registry, Functionalities) {
     ASSERT_NO_FATAL_FAILURE([[maybe_unused]] auto alloc = registry.get_allocator());
 
     ASSERT_EQ(registry.storage<entt::entity>().size(), 0u);
-    ASSERT_EQ(registry.alive(), 0u);
+    ASSERT_EQ(registry.storage<entt::entity>().in_use(), 0u);
     ASSERT_NO_FATAL_FAILURE(registry.reserve(42));
     ASSERT_EQ(registry.capacity(), 42u);
     ASSERT_TRUE(registry.storage<entt::entity>().empty());
@@ -324,8 +324,7 @@ TEST(Registry, Functionalities) {
     ASSERT_EQ(static_cast<const entt::registry &>(registry).get<int>(e1), 1);
 
     ASSERT_EQ(registry.storage<entt::entity>().size(), 3u);
-    ASSERT_EQ(registry.alive(), 3u);
-    ASSERT_NE(registry.storage<entt::entity>().in_use(), 0u);
+    ASSERT_EQ(registry.storage<entt::entity>().in_use(), 3u);
 
     ASSERT_EQ(traits_type::to_version(e2), 0u);
     ASSERT_EQ(registry.current(e2), 0u);
@@ -338,13 +337,11 @@ TEST(Registry, Functionalities) {
     ASSERT_FALSE(registry.valid(e2));
 
     ASSERT_EQ(registry.storage<entt::entity>().size(), 3u);
-    ASSERT_EQ(registry.alive(), 2u);
-    ASSERT_NE(registry.storage<entt::entity>().in_use(), 0u);
+    ASSERT_EQ(registry.storage<entt::entity>().in_use(), 2u);
 
     ASSERT_NO_FATAL_FAILURE(registry.clear());
 
     ASSERT_EQ(registry.storage<entt::entity>().size(), 3u);
-    ASSERT_EQ(registry.alive(), 0u);
     ASSERT_EQ(registry.storage<entt::entity>().in_use(), 0u);
     ASSERT_FALSE(registry.storage<entt::entity>().empty());