From b88c1903a02a4bd2d06a6c090770373cee89fe02 Mon Sep 17 00:00:00 2001 From: skypjack Date: Mon, 20 Apr 2026 15:44:47 +0200 Subject: [PATCH] stl: std::none_of --- src/entt/entity/registry.hpp | 2 +- src/entt/entity/runtime_view.hpp | 4 ++-- src/entt/stl/algorithm.hpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index b845e7d84..27f26b781 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -938,7 +938,7 @@ public: * @return True if the entity has no elements assigned, false otherwise. */ [[nodiscard]] bool orphan(const entity_type entt) const { - return std::none_of(pools.cbegin(), pools.cend(), [entt](auto &&curr) { return curr.second->contains(entt); }); + return stl::none_of(pools.cbegin(), pools.cend(), [entt](auto &&curr) { return curr.second->contains(entt); }); } /** diff --git a/src/entt/entity/runtime_view.hpp b/src/entt/entity/runtime_view.hpp index 33ad9d355..e2b007cff 100644 --- a/src/entt/entity/runtime_view.hpp +++ b/src/entt/entity/runtime_view.hpp @@ -22,7 +22,7 @@ class runtime_view_iterator final { [[nodiscard]] bool valid() const { return (!tombstone_check || *it != tombstone) && std::all_of(++pools->begin(), pools->end(), [entt = *it](const auto *curr) { return curr->contains(entt); }) - && std::none_of(filter->cbegin(), filter->cend(), [entt = *it](const auto *curr) { return curr && curr->contains(entt); }); + && stl::none_of(filter->cbegin(), filter->cend(), [entt = *it](const auto *curr) { return curr && curr->contains(entt); }); } public: @@ -287,7 +287,7 @@ public: [[nodiscard]] bool contains(const entity_type entt) const { return !pools.empty() && std::all_of(pools.cbegin(), pools.cend(), [entt](const auto *curr) { return curr->contains(entt); }) - && std::none_of(filter.cbegin(), filter.cend(), [entt](const auto *curr) { return curr && curr->contains(entt); }) + && stl::none_of(filter.cbegin(), filter.cend(), [entt](const auto *curr) { return curr && curr->contains(entt); }) && pools.front()->index(entt) < offset(); } diff --git a/src/entt/stl/algorithm.hpp b/src/entt/stl/algorithm.hpp index 12356fac1..9d9a290a3 100644 --- a/src/entt/stl/algorithm.hpp +++ b/src/entt/stl/algorithm.hpp @@ -6,6 +6,7 @@ /*! @cond ENTT_INTERNAL */ namespace entt::stl { +using std::none_of; using std::sort; } // namespace entt::stl