oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/Tag: use class DereferenceIterator

Browse Source
This commit is contained in:
Max Kellermann 2020-04-24 16:00:05 +02:00
parent 18ca734819
commit 02556ffce9
1 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/tag/Tag.hxx
View File

@ -24,6 +24,7 @@
#include "Item.hxx" // IWYU pragma: export #include "Item.hxx" // IWYU pragma: export
#include "Chrono.hxx" #include "Chrono.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include "util/DereferenceIterator.hxx"
#include <memory> #include <memory>
#include <utility> #include <utility>
@ -151,50 +152,8 @@ struct Tag {
gcc_pure gcc_returns_nonnull gcc_pure gcc_returns_nonnull
const char *GetSortValue(TagType type) const noexcept; const char *GetSortValue(TagType type) const noexcept;
class const_iterator { using const_iterator = DereferenceIterator<TagItem *const*,
friend struct Tag; const TagItem>;
const TagItem *const*cursor;
constexpr const_iterator(const TagItem *const*_cursor) noexcept
:cursor(_cursor) {}
public:
constexpr const TagItem &operator*() const noexcept {
return **cursor;
}
constexpr const TagItem *operator->() const noexcept {
return *cursor;
}
const_iterator &operator++() noexcept {
++cursor;
return *this;
}
const_iterator operator++(int) noexcept {
auto result = cursor++;
return const_iterator{result};
}
const_iterator &operator--() noexcept {
--cursor;
return *this;
}
const_iterator operator--(int) noexcept {
auto result = cursor--;
return const_iterator{result};
}
constexpr bool operator==(const_iterator other) const noexcept {
return cursor == other.cursor;
}
constexpr bool operator!=(const_iterator other) const noexcept {
return cursor != other.cursor;
}
};
const_iterator begin() const noexcept { const_iterator begin() const noexcept {
return const_iterator{items}; return const_iterator{items};