Просмотр исходного кода

registry: drop ::released (deprecated function)

Michele Caini 2 лет назад
Родитель
Сommit
8bbc113258
2 измененных файлов с 4 добавлено и 12 удалено
  1. 0 8
      src/entt/entity/registry.hpp
  2. 4 4
      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 released entities.
-     * @return The number of released entities.
-     */
-    [[deprecated("use .storage<Entity>().size() and .storage<Entity>().in_use() instead")]] [[nodiscard]] size_type released() const noexcept {
-        return (entities.size() - entities.in_use());
-    }
-
     /**
      * @brief Checks if an identifier refers to a valid entity.
      * @param entt An identifier, either valid or not.

+ 4 - 4
test/entt/entity/registry.cpp

@@ -387,13 +387,13 @@ TEST(Registry, Functionalities) {
 
 TEST(Registry, Constructors) {
     entt::registry registry;
-    entt::registry other{42};
+    entt::registry other{42u};
 
     ASSERT_TRUE(registry.storage<entt::entity>().empty());
     ASSERT_TRUE(other.storage<entt::entity>().empty());
 
-    ASSERT_EQ(registry.released(), 0u);
-    ASSERT_EQ(other.released(), 0u);
+    ASSERT_EQ(registry.storage().begin(), registry.storage().end());
+    ASSERT_EQ(other.storage().begin(), other.storage().end());
 }
 
 TEST(Registry, Move) {
@@ -2050,7 +2050,7 @@ TEST(Registry, AssignEntities) {
 
     entt::registry other;
     const auto *data = registry.storage<entt::entity>().data();
-    other.assign(data, data + registry.storage<entt::entity>().size(), registry.released());
+    other.assign(data, data + registry.storage<entt::entity>().size(), registry.storage<entt::entity>().size() - registry.storage<entt::entity>().in_use());
 
     ASSERT_EQ(registry.storage<entt::entity>().size(), other.storage<entt::entity>().size());
     ASSERT_TRUE(other.valid(entities[0]));