gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 10:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling skipEmpty() for AssignedProtos::end()

Browse Source
This commit is contained in:
ISSOtm
2022-03-07 22:51:47 +01:00
committed by Eldred Habert
parent fdfedc45a6
commit 3d79f76e41
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gfx/pal_packing.cpp
View File

@@ -89,13 +89,12 @@ private:
Constness<decltype(_assigned)> *_array = nullptr; Constness<decltype(_assigned)> *_array = nullptr;
Inner _iter{}; Inner _iter{};
Iter(decltype(_array) array, decltype(_iter) &&iter) : _array(array), _iter(iter) { Iter(decltype(_array) array, decltype(_iter) &&iter) : _array(array), _iter(iter) {}
skipEmpty(); Iter &skipEmpty() {
}
void skipEmpty() {
while (_iter != _array->end() && !_iter->has_value()) { while (_iter != _array->end() && !_iter->has_value()) {
++_iter; ++_iter;
} }
return *this;
} }
public: public:
@@ -128,10 +127,12 @@ private:
}; };
public: public:
using iterator = Iter<decltype(_assigned)::iterator, std::remove_const_t>; using iterator = Iter<decltype(_assigned)::iterator, std::remove_const_t>;
iterator begin() { return iterator{&_assigned, _assigned.begin()}; } iterator begin() { return iterator{&_assigned, _assigned.begin()}.skipEmpty(); }
iterator end() { return iterator{&_assigned, _assigned.end()}; } iterator end() { return iterator{&_assigned, _assigned.end()}; }
using const_iterator = Iter<decltype(_assigned)::const_iterator, std::add_const_t>; using const_iterator = Iter<decltype(_assigned)::const_iterator, std::add_const_t>;
const_iterator begin() const { return const_iterator{&_assigned, _assigned.begin()}; } const_iterator begin() const {
return const_iterator{&_assigned, _assigned.begin()}.skipEmpty();
}
const_iterator end() const { return const_iterator{&_assigned, _assigned.end()}; } const_iterator end() const { return const_iterator{&_assigned, _assigned.end()}; }
/** /**