File tree Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -23,13 +23,6 @@ namespace entt {
23
23
24
24
namespace internal {
25
25
26
- template <typename Type, typename ... Other>
27
- std::enable_if_t <(std::is_same_v<Type, Other> && ...), const Type *>
28
- pick_best (const Type *first, const Other *...other) noexcept {
29
- ((first = other->size () < first->size () ? other : first), ...);
30
- return first;
31
- }
32
-
33
26
template <typename ... Args, typename Type, std::size_t N>
34
27
auto filter_as_tuple (const std::array<const Type *, N> &filter) noexcept {
35
28
return std::apply ([](const auto *...curr ) { return std::make_tuple (static_cast <Args *>(const_cast <constness_as_t <Type, Args> *>(curr))...); }, filter);
@@ -271,7 +264,9 @@ class basic_view<get_t<Get...>, exclude_t<Exclude...>> {
271
264
basic_view (Get &...value, Exclude &...exclude) noexcept
272
265
: pools{&value...},
273
266
filter{&exclude...},
274
- view{internal::pick_best (static_cast <const base_type *>(&value)...)} {}
267
+ view{std::get<0 >(pools)} {
268
+ ((view = value.size () < view->size () ? &value : view), ...);
269
+ }
275
270
276
271
/* *
277
272
* @brief Constructs a multi-type view from a set of storage classes.
You can’t perform that action at this time.
0 commit comments