Skip to content

Commit d13c126

Browse files
committed
view: avoid name clashes
1 parent 9b54ee3 commit d13c126

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Diff for: src/entt/entity/view.hpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class view_iterator final {
5454
pools{},
5555
filter{} {}
5656

57-
view_iterator(iterator_type curr, iterator_type to, std::array<const Type *, Get> all_of, std::array<const Type *, Exclude> none_of) noexcept
57+
view_iterator(iterator_type curr, iterator_type to, std::array<const Type *, Get> value, std::array<const Type *, Exclude> excl) noexcept
5858
: it{curr},
5959
last{to},
60-
pools{all_of},
61-
filter{none_of} {
60+
pools{value},
61+
filter{excl} {
6262
while(it != last && !valid()) {
6363
++it;
6464
}
@@ -114,9 +114,9 @@ struct extended_view_iterator final {
114114
: it{},
115115
pools{} {}
116116

117-
extended_view_iterator(It from, std::tuple<Type *...> storage)
117+
extended_view_iterator(It from, std::tuple<Type *...> value)
118118
: it{from},
119-
pools{storage} {}
119+
pools{value} {}
120120

121121
extended_view_iterator &operator++() noexcept {
122122
return ++it, *this;
@@ -257,11 +257,11 @@ class basic_view<get_t<Get...>, exclude_t<Exclude...>> {
257257
/**
258258
* @brief Constructs a multi-type view from a set of storage classes.
259259
* @param value The storage for the types to iterate.
260-
* @param exclude The storage for the types used to filter the view.
260+
* @param excl The storage for the types used to filter the view.
261261
*/
262-
basic_view(Get &...value, Exclude &...exclude) noexcept
262+
basic_view(Get &...value, Exclude &...excl) noexcept
263263
: pools{&value...},
264-
filter{&exclude...},
264+
filter{&excl...},
265265
view{std::get<0>(pools)} {
266266
((view = value.size() < view->size() ? &value : view), ...);
267267
}
@@ -574,18 +574,18 @@ class basic_view<get_t<Get>, exclude_t<>, std::void_t<std::enable_if_t<!Get::tra
574574

575575
/**
576576
* @brief Constructs a single-type view from a storage class.
577-
* @param ref The storage for the type to iterate.
577+
* @param value The storage for the type to iterate.
578578
*/
579-
basic_view(Get &ref) noexcept
580-
: pools{&ref},
579+
basic_view(Get &value) noexcept
580+
: pools{&value},
581581
filter{} {}
582582

583583
/**
584584
* @brief Constructs a single-type view from a storage class.
585-
* @param ref The storage for the type to iterate.
585+
* @param value The storage for the type to iterate.
586586
*/
587-
basic_view(std::tuple<Get &> ref, std::tuple<> = {}) noexcept
588-
: basic_view{std::get<0>(ref)} {}
587+
basic_view(std::tuple<Get &> value, std::tuple<> = {}) noexcept
588+
: basic_view{std::get<0>(value)} {}
589589

590590
/**
591591
* @brief Returns the leading storage of a view.

0 commit comments

Comments
 (0)