diff --git a/TODO b/TODO index d4737eae0..c3f1091d5 100644 --- a/TODO +++ b/TODO @@ -34,6 +34,5 @@ TODO: * more test around views and storage entity - ie view ::back * table: pop back to support swap and pop, single column access, empty type optimization * checkout tools workflow -* meta: avoid unnecessary copies of iterators with meta containers * review constrained noexcept-ness (ie sigh) * offer 16b from meta_traits to users or change type diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index 0a925bb6c..a1b4574e1 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -60,6 +60,10 @@ class view_iterator final { && internal::none_of(pools.begin() + Get, pools.end(), entt); } + void seek_next() { + for(constexpr iterator_type sentinel{}; it != sentinel && !valid(*it); ++it) {} + } + public: using value_type = typename iterator_traits::value_type; using pointer = typename iterator_traits::pointer; @@ -69,22 +73,19 @@ public: constexpr view_iterator() noexcept : it{}, - last{}, pools{}, index{} {} view_iterator(iterator_type first, std::array value, const std::size_t idx) noexcept : it{first}, - last{value[idx]->end()}, pools{value}, index{idx} { - while(it != last && !valid(*it)) { - ++it; - } + seek_next(); } view_iterator &operator++() noexcept { - while(++it != last && !valid(*it)) {} + ++it; + seek_next(); return *this; } @@ -106,7 +107,6 @@ public: private: iterator_type it; - iterator_type last; std::array pools; std::size_t index; };