diff --git a/test/entt/entity/group.cpp b/test/entt/entity/group.cpp index 4655a498c..091662eec 100644 --- a/test/entt/entity/group.cpp +++ b/test/entt/entity/group.cpp @@ -279,28 +279,28 @@ TEST(NonOwningGroup, IndexRebuiltOnDestroy) { TEST(NonOwningGroup, ConstNonConstAndAllInBetween) { entt::registry registry; - auto group = registry.group(entt::get>); + auto group = registry.group(entt::get); ASSERT_EQ(group.size(), decltype(group.size()){0}); const auto entity = registry.create(); registry.assign(entity, 0); registry.assign(entity, 'c'); - registry.assign>(entity); + registry.assign(entity); ASSERT_EQ(group.size(), decltype(group.size()){1}); ASSERT_TRUE((std::is_same_v({})), int &>)); ASSERT_TRUE((std::is_same_v({})), const char &>)); - ASSERT_TRUE((std::is_same_v>({})), entt::tag<"empty"_hs>>)); - ASSERT_TRUE((std::is_same_v>({})), std::tuple>>)); + ASSERT_TRUE((std::is_same_v({})), std::true_type>)); + ASSERT_TRUE((std::is_same_v({})), std::tuple>)); ASSERT_TRUE((std::is_same_v()), const char *>)); ASSERT_TRUE((std::is_same_v()), int *>)); group.each([](auto &&i, auto &&c, auto &&e) { ASSERT_TRUE((std::is_same_v)); ASSERT_TRUE((std::is_same_v)); - ASSERT_TRUE((std::is_same_v &&>)); + ASSERT_TRUE((std::is_same_v)); }); } @@ -792,7 +792,7 @@ TEST(OwningGroup, IndexRebuiltOnDestroy) { TEST(OwningGroup, ConstNonConstAndAllInBetween) { entt::registry registry; - auto group = registry.group(entt::get>); + auto group = registry.group(entt::get); ASSERT_EQ(group.size(), decltype(group.size()){0}); @@ -801,7 +801,7 @@ TEST(OwningGroup, ConstNonConstAndAllInBetween) { registry.assign(entity, 'c'); registry.assign(entity, 0.); registry.assign(entity, 0.f); - registry.assign>(entity); + registry.assign(entity); ASSERT_EQ(group.size(), decltype(group.size()){1}); @@ -809,8 +809,8 @@ TEST(OwningGroup, ConstNonConstAndAllInBetween) { ASSERT_TRUE((std::is_same_v({})), const char &>)); ASSERT_TRUE((std::is_same_v({})), double &>)); ASSERT_TRUE((std::is_same_v({})), const float &>)); - ASSERT_TRUE((std::is_same_v>({})), entt::tag<"empty"_hs>>)); - ASSERT_TRUE((std::is_same_v>({})), std::tuple>>)); + ASSERT_TRUE((std::is_same_v({})), std::true_type>)); + ASSERT_TRUE((std::is_same_v({})), std::tuple>)); ASSERT_TRUE((std::is_same_v()), const float *>)); ASSERT_TRUE((std::is_same_v()), double *>)); ASSERT_TRUE((std::is_same_v()), const char *>)); @@ -821,7 +821,7 @@ TEST(OwningGroup, ConstNonConstAndAllInBetween) { ASSERT_TRUE((std::is_same_v)); ASSERT_TRUE((std::is_same_v)); ASSERT_TRUE((std::is_same_v)); - ASSERT_TRUE((std::is_same_v &&>)); + ASSERT_TRUE((std::is_same_v)); }); } diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp index cfe04f414..a84b0cc78 100644 --- a/test/entt/entity/view.cpp +++ b/test/entt/entity/view.cpp @@ -406,28 +406,28 @@ TEST(MultipleComponentView, EachWithHoles) { TEST(MultipleComponentView, ConstNonConstAndAllInBetween) { entt::registry registry; - auto view = registry.view>(); + auto view = registry.view(); ASSERT_EQ(view.size(), decltype(view.size()){0}); const auto entity = registry.create(); registry.assign(entity, 0); registry.assign(entity, 'c'); - registry.assign>(entity); + registry.assign(entity); ASSERT_EQ(view.size(), decltype(view.size()){1}); ASSERT_TRUE((std::is_same_v({})), int &>)); ASSERT_TRUE((std::is_same_v({})), const char &>)); - ASSERT_TRUE((std::is_same_v>({})), entt::tag<"empty"_hs>>)); - ASSERT_TRUE((std::is_same_v>({})), std::tuple>>)); + ASSERT_TRUE((std::is_same_v({})), std::true_type>)); + ASSERT_TRUE((std::is_same_v({})), std::tuple>)); ASSERT_TRUE((std::is_same_v()), const char *>)); ASSERT_TRUE((std::is_same_v()), int *>)); view.each([](auto &&i, auto &&c, auto &&e) { ASSERT_TRUE((std::is_same_v)); ASSERT_TRUE((std::is_same_v)); - ASSERT_TRUE((std::is_same_v &&>)); + ASSERT_TRUE((std::is_same_v)); }); }