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

util/IntrusiveList: add type aliases value_type, pointer, reference

Browse Source
This commit is contained in:
Max Kellermann 2022-11-11 16:51:49 +01:00
parent b4a64af15e
commit 04ab8ae27b
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/IntrusiveForwardList.hxx
View File

@ -152,6 +152,11 @@ class IntrusiveForwardList {
} }
public: public:
using value_type = T;
using reference = T &;
using const_reference = const T &;
using pointer = T *;
using const_pointer = const T *;
using size_type = std::size_t; using size_type = std::size_t;
IntrusiveForwardList() = default; IntrusiveForwardList() = default;
@ -202,11 +207,11 @@ public:
} }
} }
const T &front() const noexcept { const_reference front() const noexcept {
return *Cast(head.next); return *Cast(head.next);
} }
T &front() noexcept { reference front() noexcept {
return *Cast(head.next); return *Cast(head.next);
} }
@ -243,11 +248,11 @@ public:
return !(*this == other); return !(*this == other);
} }
constexpr T &operator*() const noexcept { constexpr reference operator*() const noexcept {
return *Cast(cursor); return *Cast(cursor);
} }
constexpr T *operator->() const noexcept { constexpr pointer operator->() const noexcept {
return Cast(cursor); return Cast(cursor);
} }
@ -297,11 +302,11 @@ public:
return !(*this == other); return !(*this == other);
} }
constexpr const T &operator*() const noexcept { constexpr reference operator*() const noexcept {
return *Cast(cursor); return *Cast(cursor);
} }
constexpr const T *operator->() const noexcept { constexpr pointer operator->() const noexcept {
return Cast(cursor); return Cast(cursor);
} }
@ -315,14 +320,14 @@ public:
return {head.next}; return {head.next};
} }
void push_front(T &t) noexcept { void push_front(reference t) noexcept {
auto &new_node = ToNode(t); auto &new_node = ToNode(t);
new_node.next = head.next; new_node.next = head.next;
head.next = &new_node; head.next = &new_node;
++counter; ++counter;
} }
static iterator insert_after(iterator pos, T &t) noexcept { static iterator insert_after(iterator pos, reference t) noexcept {
// no counter update in this static method // no counter update in this static method
static_assert(!constant_time_size); static_assert(!constant_time_size);

29
src/util/IntrusiveList.hxx
View File

@ -227,6 +227,11 @@ class IntrusiveList {
} }
public: public:
using value_type = T;
using reference = T &;
using const_reference = const T &;
using pointer = T *;
using const_pointer = const T *;
using size_type = std::size_t; using size_type = std::size_t;
constexpr IntrusiveList() noexcept = default; constexpr IntrusiveList() noexcept = default;
@ -327,11 +332,11 @@ public:
} }
} }
const T &front() const noexcept { const_reference front() const noexcept {
return *Cast(head.next); return *Cast(head.next);
} }
T &front() noexcept { reference front() noexcept {
return *Cast(head.next); return *Cast(head.next);
} }
@ -348,7 +353,7 @@ public:
disposer(&i); disposer(&i);
} }
T &back() noexcept { reference back() noexcept {
return *Cast(head.prev); return *Cast(head.prev);
} }
@ -385,11 +390,11 @@ public:
return !(*this == other); return !(*this == other);
} }
constexpr T &operator*() const noexcept { constexpr reference operator*() const noexcept {
return *Cast(cursor); return *Cast(cursor);
} }
constexpr T *operator->() const noexcept { constexpr pointer operator->() const noexcept {
return Cast(cursor); return Cast(cursor);
} }
@ -418,7 +423,7 @@ public:
return {&head}; return {&head};
} }
static constexpr iterator iterator_to(T &t) noexcept { static constexpr iterator iterator_to(reference t) noexcept {
return {&ToNode(t)}; return {&ToNode(t)};
} }
@ -450,11 +455,11 @@ public:
return !(*this == other); return !(*this == other);
} }
constexpr const T &operator*() const noexcept { constexpr reference operator*() const noexcept {
return *Cast(cursor); return *Cast(cursor);
} }
constexpr const T *operator->() const noexcept { constexpr pointer operator->() const noexcept {
return Cast(cursor); return Cast(cursor);
} }
@ -483,7 +488,7 @@ public:
return {&head}; return {&head};
} }
static constexpr iterator iterator_to(const T &t) noexcept { static constexpr const_iterator iterator_to(const_reference t) noexcept {
return {&ToNode(t)}; return {&ToNode(t)};
} }
@ -501,15 +506,15 @@ public:
return result; return result;
} }
void push_front(T &t) noexcept { void push_front(reference t) noexcept {
insert(begin(), t); insert(begin(), t);
} }
void push_back(T &t) noexcept { void push_back(reference t) noexcept {
insert(end(), t); insert(end(), t);
} }
void insert(iterator p, T &t) noexcept { void insert(iterator p, reference t) noexcept {
static_assert(!constant_time_size || static_assert(!constant_time_size ||
!HookTraits::IsAutoUnlink(), !HookTraits::IsAutoUnlink(),
"Can't use auto-unlink hooks with constant_time_size"); "Can't use auto-unlink hooks with constant_time_size");