view: stable multi type view ::begin/::end functions

This commit is contained in:
Michele Caini
2023-04-28 15:48:09 +02:00
parent bdabbaa63d
commit 1b22809412
2 changed files with 5 additions and 2 deletions

View File

@@ -391,7 +391,7 @@ public:
* @return An iterator to the first entity of the view.
*/
[[nodiscard]] iterator begin() const noexcept {
return iterator{view->begin(), view->end(), opaque_check_set(), filter};
return view ? iterator{view->begin(), view->end(), opaque_check_set(), filter} : iterator{};
}
/**
@@ -404,7 +404,7 @@ public:
* @return An iterator to the entity following the last entity of the view.
*/
[[nodiscard]] iterator end() const noexcept {
return iterator{view->end(), view->end(), opaque_check_set(), filter};
return view ? iterator{view->end(), view->end(), opaque_check_set(), filter} : iterator{};
}
/**

View File

@@ -633,6 +633,9 @@ TEST(MultiComponentView, InvalidView) {
ASSERT_EQ(view.size_hint(), 0u);
ASSERT_FALSE(view.contains(entt::null));
ASSERT_EQ(view.begin(), typename decltype(view)::iterator{});
ASSERT_EQ(view.begin(), view.end());
entt::storage<int> storage;
view.storage(storage);