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

updated single include file

Browse Source
This commit is contained in:
Michele Caini
2022-08-02 09:23:51 +02:00
parent 268723c87b
commit e4ccb878f4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
single_include/entt/entt.hpp
View File

@@ -17430,7 +17430,7 @@ protected:
void swap_and_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override { void swap_and_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
for(; first != last; ++first) { for(; first != last; ++first) {
// cannot use first::index() because it would break with cross iterators // cannot use first::index() because it would break with cross iterators
const auto pos = index(*first); const auto pos = base_type::index(*first);
auto &elem = element_at(base_type::size() - 1u); auto &elem = element_at(base_type::size() - 1u);
// destroying on exit allows reentrant destructors // destroying on exit allows reentrant destructors
[[maybe_unused]] auto unused = std::exchange(element_at(pos), std::move(elem)); [[maybe_unused]] auto unused = std::exchange(element_at(pos), std::move(elem));
@@ -17447,7 +17447,7 @@ protected:
void in_place_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override { void in_place_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
for(; first != last; ++first) { for(; first != last; ++first) {
// cannot use first::index() because it would break with cross iterators // cannot use first::index() because it would break with cross iterators
const auto pos = index(*first); const auto pos = base_type::index(*first);
base_type::in_place_pop(first, first + 1u); base_type::in_place_pop(first, first + 1u);
std::destroy_at(std::addressof(element_at(pos))); std::destroy_at(std::addressof(element_at(pos)));
} }
@@ -31615,7 +31615,7 @@ protected:
void swap_and_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override { void swap_and_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
for(; first != last; ++first) { for(; first != last; ++first) {
// cannot use first::index() because it would break with cross iterators // cannot use first::index() because it would break with cross iterators
const auto pos = index(*first); const auto pos = base_type::index(*first);
auto &elem = element_at(base_type::size() - 1u); auto &elem = element_at(base_type::size() - 1u);
// destroying on exit allows reentrant destructors // destroying on exit allows reentrant destructors
[[maybe_unused]] auto unused = std::exchange(element_at(pos), std::move(elem)); [[maybe_unused]] auto unused = std::exchange(element_at(pos), std::move(elem));
@@ -31632,7 +31632,7 @@ protected:
void in_place_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override { void in_place_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
for(; first != last; ++first) { for(; first != last; ++first) {
// cannot use first::index() because it would break with cross iterators // cannot use first::index() because it would break with cross iterators
const auto pos = index(*first); const auto pos = base_type::index(*first);
base_type::in_place_pop(first, first + 1u); base_type::in_place_pop(first, first + 1u);
std::destroy_at(std::addressof(element_at(pos))); std::destroy_at(std::addressof(element_at(pos)));
} }