diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index ecd6906e7..63c039b93 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -193,7 +193,7 @@ class basic_registry { std::unique_ptr> pool; void(* remove)(sparse_set &, basic_registry &, const Entity); std::unique_ptr>(* clone)(const sparse_set &); - void(* stomp)(const sparse_set &, const Entity, registry &, const Entity); + void(* stomp)(const sparse_set &, const Entity, basic_registry &, const Entity); ENTT_ID_TYPE runtime_type; }; @@ -282,7 +282,7 @@ class basic_registry { return std::make_unique>(static_cast &>(cpool)); }; - pdata->stomp = [](const sparse_set &cpool, const Entity from, registry &other, const Entity to) { + pdata->stomp = [](const sparse_set &cpool, const Entity from, basic_registry &other, const Entity to) { other.assign_or_replace(to, static_cast &>(cpool).get(from)); }; } else { @@ -1559,7 +1559,7 @@ public: * @param to A valid entity identifier to copy to. */ template - void stomp(const Entity from, registry &other, const Entity to, exclude_t = {}) { + void stomp(const Entity from, basic_registry &other, const Entity to, exclude_t = {}) { static_assert(std::conjunction_v...>); ENTT_ASSERT(valid(from) && other.valid(to));