From 04ab8ae27b90fd01577c586563c5f21539d24038 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Fri, 11 Nov 2022 16:51:49 +0100
Subject: [PATCH] util/IntrusiveList: add type aliases value_type, pointer,
 reference

---
 src/util/IntrusiveForwardList.hxx | 21 +++++++++++++--------
 src/util/IntrusiveList.hxx        | 29 +++++++++++++++++------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/util/IntrusiveForwardList.hxx b/src/util/IntrusiveForwardList.hxx
index 7a3c5cec7..147c1b62f 100644
--- a/src/util/IntrusiveForwardList.hxx
+++ b/src/util/IntrusiveForwardList.hxx
@@ -152,6 +152,11 @@ class IntrusiveForwardList {
 	}
 
 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;
 
 	IntrusiveForwardList() = default;
@@ -202,11 +207,11 @@ public:
 		}
 	}
 
-	const T &front() const noexcept {
+	const_reference front() const noexcept {
 		return *Cast(head.next);
 	}
 
-	T &front() noexcept {
+	reference front() noexcept {
 		return *Cast(head.next);
 	}
 
@@ -243,11 +248,11 @@ public:
 			return !(*this == other);
 		}
 
-		constexpr T &operator*() const noexcept {
+		constexpr reference operator*() const noexcept {
 			return *Cast(cursor);
 		}
 
-		constexpr T *operator->() const noexcept {
+		constexpr pointer operator->() const noexcept {
 			return Cast(cursor);
 		}
 
@@ -297,11 +302,11 @@ public:
 			return !(*this == other);
 		}
 
-		constexpr const T &operator*() const noexcept {
+		constexpr reference operator*() const noexcept {
 			return *Cast(cursor);
 		}
 
-		constexpr const T *operator->() const noexcept {
+		constexpr pointer operator->() const noexcept {
 			return Cast(cursor);
 		}
 
@@ -315,14 +320,14 @@ public:
 		return {head.next};
 	}
 
-	void push_front(T &t) noexcept {
+	void push_front(reference t) noexcept {
 		auto &new_node = ToNode(t);
 		new_node.next = head.next;
 		head.next = &new_node;
 		++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
 		static_assert(!constant_time_size);
 
diff --git a/src/util/IntrusiveList.hxx b/src/util/IntrusiveList.hxx
index cb1315103..f116d88fb 100644
--- a/src/util/IntrusiveList.hxx
+++ b/src/util/IntrusiveList.hxx
@@ -227,6 +227,11 @@ class IntrusiveList {
 	}
 
 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;
 
 	constexpr IntrusiveList() noexcept = default;
@@ -327,11 +332,11 @@ public:
 		}
 	}
 
-	const T &front() const noexcept {
+	const_reference front() const noexcept {
 		return *Cast(head.next);
 	}
 
-	T &front() noexcept {
+	reference front() noexcept {
 		return *Cast(head.next);
 	}
 
@@ -348,7 +353,7 @@ public:
 		disposer(&i);
 	}
 
-	T &back() noexcept {
+	reference back() noexcept {
 		return *Cast(head.prev);
 	}
 
@@ -385,11 +390,11 @@ public:
 			return !(*this == other);
 		}
 
-		constexpr T &operator*() const noexcept {
+		constexpr reference operator*() const noexcept {
 			return *Cast(cursor);
 		}
 
-		constexpr T *operator->() const noexcept {
+		constexpr pointer operator->() const noexcept {
 			return Cast(cursor);
 		}
 
@@ -418,7 +423,7 @@ public:
 		return {&head};
 	}
 
-	static constexpr iterator iterator_to(T &t) noexcept {
+	static constexpr iterator iterator_to(reference t) noexcept {
 		return {&ToNode(t)};
 	}
 
@@ -450,11 +455,11 @@ public:
 			return !(*this == other);
 		}
 
-		constexpr const T &operator*() const noexcept {
+		constexpr reference operator*() const noexcept {
 			return *Cast(cursor);
 		}
 
-		constexpr const T *operator->() const noexcept {
+		constexpr pointer operator->() const noexcept {
 			return Cast(cursor);
 		}
 
@@ -483,7 +488,7 @@ public:
 		return {&head};
 	}
 
-	static constexpr iterator iterator_to(const T &t) noexcept {
+	static constexpr const_iterator iterator_to(const_reference t) noexcept {
 		return {&ToNode(t)};
 	}
 
@@ -501,15 +506,15 @@ public:
 		return result;
 	}
 
-	void push_front(T &t) noexcept {
+	void push_front(reference t) noexcept {
 		insert(begin(), t);
 	}
 
-	void push_back(T &t) noexcept {
+	void push_back(reference t) noexcept {
 		insert(end(), t);
 	}
 
-	void insert(iterator p, T &t) noexcept {
+	void insert(iterator p, reference t) noexcept {
 		static_assert(!constant_time_size ||
 			      !HookTraits::IsAutoUnlink(),
 			      "Can't use auto-unlink hooks with constant_time_size");