diff --git a/src/entt/core/tuple.hpp b/src/entt/core/tuple.hpp index 6de5c8a07..3bd8c0f57 100644 --- a/src/entt/core/tuple.hpp +++ b/src/entt/core/tuple.hpp @@ -19,7 +19,7 @@ namespace entt { * element otherwise. */ template -constexpr decltype(auto) unwrap_tuple(Type && value) ENTT_NOEXCEPT { +constexpr decltype(auto) unwrap_tuple(Type &&value) ENTT_NOEXCEPT { if constexpr(std::tuple_size_v> == 1u) { return std::get<0>(std::forward(value)); } else { diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp index b12c57747..39588c087 100644 --- a/src/entt/entity/group.hpp +++ b/src/entt/entity/group.hpp @@ -441,14 +441,16 @@ public: if constexpr(sizeof...(Component) == 0) { static_assert(std::is_invocable_v, "Invalid comparison function"); handler->sort(std::move(compare), std::move(algo), std::forward(args)...); - } else if constexpr(sizeof...(Component) == 1) { - handler->sort([this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); - }, std::move(algo), std::forward(args)...); } else { - handler->sort([this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); - }, std::move(algo), std::forward(args)...); + auto forward_compare = [this, &compare](const entity_type lhs, const entity_type rhs) { + if constexpr(sizeof...(Component) == 1) { + return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); + } else { + return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); + } + }; + + handler->sort(std::move(forward_compare), std::move(algo), std::forward(args)...); } } } @@ -938,14 +940,16 @@ public: if constexpr(sizeof...(Component) == 0) { static_assert(std::is_invocable_v, "Invalid comparison function"); cpool->sort_n(*length, std::move(compare), std::move(algo), std::forward(args)...); - } else if constexpr(sizeof...(Component) == 1) { - cpool->sort_n(*length, [this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); - }, std::move(algo), std::forward(args)...); } else { - cpool->sort_n(*length, [this, compare = std::move(compare)](const entity_type lhs, const entity_type rhs) { - return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); - }, std::move(algo), std::forward(args)...); + auto forward_compare = [this, &compare](const entity_type lhs, const entity_type rhs) { + if constexpr(sizeof...(Component) == 1) { + return compare((std::get *>(pools)->get(lhs), ...), (std::get *>(pools)->get(rhs), ...)); + } else { + return compare(std::forward_as_tuple(std::get *>(pools)->get(lhs)...), std::forward_as_tuple(std::get *>(pools)->get(rhs)...)); + } + }; + + cpool->sort_n(*length, std::move(forward_compare), std::move(algo), std::forward(args)...); } [this](auto *head, auto *... other) {