From 1f7f613800fd4ce406359042e668075debb5b83f Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 24 Oct 2023 11:11:11 +0200 Subject: [PATCH] sparse_set: use scoped iterators within ::sort --- src/entt/entity/sparse_set.hpp | 2 +- test/entt/entity/sparse_set.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp index 5ac93ce63..d8722989d 100644 --- a/src/entt/entity/sparse_set.hpp +++ b/src/entt/entity/sparse_set.hpp @@ -1040,7 +1040,7 @@ public: */ template void sort(Compare compare, Sort algo = Sort{}, Args &&...args) { - sort_n(packed.size(), std::move(compare), std::move(algo), std::forward(args)...); + sort_n(static_cast(end(0) - begin(0)), std::move(compare), std::move(algo), std::forward(args)...); } /** diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp index f8ccb8b21..12d78c9d6 100644 --- a/test/entt/entity/sparse_set.cpp +++ b/test/entt/entity/sparse_set.cpp @@ -1745,11 +1745,11 @@ ENTT_DEBUG_TYPED_TEST(SparseSetDeathTest, Sort) { set.erase(entity); switch(policy) { - case entt::deletion_policy::swap_and_pop: { + case entt::deletion_policy::swap_and_pop: + case entt::deletion_policy::swap_only: { SUCCEED(); } break; - case entt::deletion_policy::in_place: - case entt::deletion_policy::swap_only: { + case entt::deletion_policy::in_place: { ASSERT_DEATH(set.sort(std::less{});, ""); } break; }