|
@@ -268,8 +268,8 @@ protected:
|
|
|
[[nodiscard]] const Type *storage(const std::size_t pos) const noexcept {
|
|
[[nodiscard]] const Type *storage(const std::size_t pos) const noexcept {
|
|
|
if(pos < Get) {
|
|
if(pos < Get) {
|
|
|
return pools[pos];
|
|
return pools[pos];
|
|
|
- } else if(filter[pos - Get] != internal::view_placeholder<Type>()) {
|
|
|
|
|
- return filter[pos - Get];
|
|
|
|
|
|
|
+ } else if(const auto idx = pos - Get; filter[idx] != internal::view_placeholder<Type>()) {
|
|
|
|
|
+ return filter[idx];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return nullptr;
|
|
return nullptr;
|
|
@@ -280,7 +280,8 @@ protected:
|
|
|
pools[pos] = elem;
|
|
pools[pos] = elem;
|
|
|
refresh();
|
|
refresh();
|
|
|
} else {
|
|
} else {
|
|
|
- filter[pos - Get] = (elem == nullptr) ? internal::view_placeholder<Type>() : elem;
|
|
|
|
|
|
|
+ ENTT_ASSERT(elem != nullptr, "Unexpected element");
|
|
|
|
|
+ filter[pos - Get] = elem;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|