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

storage: cleanup

Browse Source
This commit is contained in:
Michele Caini
2022-04-13 17:25:05 +02:00
parent 803db476bb
commit 6b06a9ff2b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/entt/entity/storage.hpp
View File

@@ -326,12 +326,15 @@ private:
}
protected:
/*! @brief Random access iterator type. */
using basic_iterator = typename underlying_type::basic_iterator;
/**
* @brief Erases elements from a storage.
* @param first An iterator to the first element to erase.
* @param last An iterator past the last element to erase.
*/
void swap_and_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
void swap_and_pop(basic_iterator first, basic_iterator last) override {
for(; first != last; ++first) {
auto &elem = element_at(base_type::size() - 1u);
// destroying on exit allows reentrant destructors
@@ -346,7 +349,7 @@ protected:
* @param first An iterator to the first element to erase.
* @param last An iterator past the last element to erase.
*/
void in_place_pop(typename underlying_type::basic_iterator first, typename underlying_type::basic_iterator last) override {
void in_place_pop(basic_iterator first, basic_iterator last) override {
for(; first != last; ++first) {
base_type::in_place_pop(first, first + 1u);
std::destroy_at(std::addressof(element_at(static_cast<size_type>(first.index()))));
@@ -360,7 +363,7 @@ protected:
* @param force_back Force back insertion.
* @return Iterator pointing to the emplaced element.
*/
typename underlying_type::basic_iterator try_emplace([[maybe_unused]] const Entity entt, const bool force_back, const void *value) override {
basic_iterator try_emplace([[maybe_unused]] const Entity entt, const bool force_back, const void *value) override {
if(value) {
if constexpr(std::is_copy_constructible_v<value_type>) {
return emplace_element(entt, force_back, *static_cast<const value_type *>(value));