From 04d734e76c13c39a6016722db0bd2da971e6ce98 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 9 Feb 2023 12:44:23 +0100 Subject: [PATCH] registry: prepare to turn the entity pool in a plain storage --- src/entt/entity/registry.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index 1119930ab..b3a961bb1 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -395,8 +395,6 @@ public: pools{std::move(other.pools)}, entities{std::move(other.entities)}, groups{std::move(other.groups)} { - ENTT_ASSERT(alloc_traits::is_always_equal::value || get_allocator() == other.get_allocator(), "Copying a registry is not allowed"); - rebind(); } @@ -406,8 +404,6 @@ public: * @return This registry. */ basic_registry &operator=(basic_registry &&other) noexcept { - ENTT_ASSERT(alloc_traits::is_always_equal::value || get_allocator() == other.get_allocator(), "Copying a registry is not allowed"); - vars = std::move(other.vars); pools = std::move(other.pools); entities = std::move(other.entities); @@ -439,7 +435,7 @@ public: * @return The associated allocator. */ [[nodiscard]] constexpr allocator_type get_allocator() const noexcept { - return entities.get_allocator(); + return pools.get_allocator(); } /**