diff --git a/test/entt/entity/sigh_mixin.cpp b/test/entt/entity/sigh_mixin.cpp index 1155a5cc2..c91df1d1e 100644 --- a/test/entt/entity/sigh_mixin.cpp +++ b/test/entt/entity/sigh_mixin.cpp @@ -322,7 +322,7 @@ TYPED_TEST(SighMixin, Move) { std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(registry)); + pool.bind(registry); pool.on_construct().template connect<&listener>(on_construct); pool.on_destroy().template connect<&listener>(on_destroy); @@ -355,7 +355,7 @@ TYPED_TEST(SighMixin, Move) { ASSERT_EQ(pool.get(entt::entity{3}), value_type{3}); other = entt::sigh_mixin>{}; - other.bind(entt::forward_as_any(registry)); + other.bind(registry); other.emplace(entt::entity{1}, 1); other = std::move(pool); @@ -384,11 +384,11 @@ TYPED_TEST(SighMixin, Swap) { std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(registry)); + pool.bind(registry); pool.on_construct().template connect<&listener>(on_construct); pool.on_destroy().template connect<&listener>(on_destroy); - other.bind(entt::forward_as_any(registry)); + other.bind(registry); other.on_construct().template connect<&listener>(on_construct); other.on_destroy().template connect<&listener>(on_destroy); @@ -460,7 +460,7 @@ TYPED_TEST(SighMixin, CustomAllocator) { std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(registry)); + pool.bind(registry); pool.on_construct().template connect<&listener>(on_construct); pool.on_destroy().template connect<&listener>(on_destroy); @@ -521,7 +521,7 @@ TYPED_TEST(SighMixin, ThrowingAllocator) { std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(registry)); + pool.bind(registry); pool.on_construct().template connect<&listener>(on_construct); pool.on_destroy().template connect<&listener>(on_destroy); @@ -589,7 +589,7 @@ TEST(SighMixin, ThrowingComponent) { std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(registry)); + pool.bind(registry); pool.on_construct().connect<&listener>(on_construct); pool.on_destroy().connect<&listener>(on_destroy); diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp index a00991d1b..eaf882710 100644 --- a/test/entt/entity/sparse_set.cpp +++ b/test/entt/entity/sparse_set.cpp @@ -441,7 +441,8 @@ TYPED_TEST(SparseSet, Bind) { for(const auto policy: this->deletion_policy) { sparse_set_type set{policy}; - ASSERT_NO_THROW(set.bind(entt::any{})); + ASSERT_NO_THROW(set.bind(0)); + ASSERT_NO_THROW(set.bind(entt::make_any(0))); } }