Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: get around an issue with clang

Browse Source
This commit is contained in:
Michele Caini
2020-10-26 12:43:55 +01:00
parent dbbb131424
commit 05f1906f77
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/entt/entity/view.hpp
View File

@@ -200,8 +200,8 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> final {
{}
public:
using iterator = iterable_view_iterator<typename basic_view::iterator>;
using reverse_iterator = iterable_view_iterator<typename basic_view::reverse_iterator>;
using iterator = iterable_view_iterator<view_iterator<typename basic_sparse_set<Entity>::iterator>>;
using reverse_iterator = iterable_view_iterator<view_iterator<typename basic_sparse_set<Entity>::reverse_iterator>>;
[[nodiscard]] iterator begin() const ENTT_NOEXCEPT {
return { view.begin(), view };
@@ -675,13 +675,13 @@ class basic_view<Entity, exclude_t<>, Component> final {
public:
using iterator = std::conditional_t<
is_eto_eligible_v<Component>,
iterable_view_iterator<typename basic_view::iterator>,
iterable_view_iterator<typename basic_view::iterator, decltype(std::declval<pool_type>().begin())>
iterable_view_iterator<typename basic_sparse_set<Entity>::iterator>,
iterable_view_iterator<typename basic_sparse_set<Entity>::iterator, decltype(std::declval<pool_type>().begin())>
>;
using reverse_iterator = std::conditional_t<
is_eto_eligible_v<Component>,
iterable_view_iterator<typename basic_view::reverse_iterator>,
iterable_view_iterator<typename basic_view::reverse_iterator, decltype(std::declval<pool_type>().rbegin())>
iterable_view_iterator<typename basic_sparse_set<Entity>::reverse_iterator>,
iterable_view_iterator<typename basic_sparse_set<Entity>::reverse_iterator, decltype(std::declval<pool_type>().rbegin())>
>;
[[nodiscard]] iterator begin() const ENTT_NOEXCEPT {