From a6635088e9a998f9126ea2bcb038a02e03692876 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Mon, 22 Jan 2024 00:14:50 +0000
Subject: [PATCH] ring buffer: Fix ambiguous comparison operators in C++20

---
 src/core/ring_buffer.hpp | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/core/ring_buffer.hpp b/src/core/ring_buffer.hpp
index f4e86151c0..5979014518 100644
--- a/src/core/ring_buffer.hpp
+++ b/src/core/ring_buffer.hpp
@@ -145,14 +145,8 @@ public:
 			return *this;
 		}
 
-		bool operator ==(const ring_buffer_iterator_base &other) const
-		{
-			return (this->ring == other.ring) && (this->pos == other.pos);
-		}
-
-		bool operator !=(const ring_buffer_iterator_base &other) const
-		{
-			return !operator ==(other);
+		friend bool operator==(const ring_buffer_iterator &a, const ring_buffer_iterator &b) noexcept {
+			return (a.ring == b.ring) && (a.pos == b.pos);
 		}
 
 		ring_buffer_iterator operator +(std::ptrdiff_t delta) const
@@ -202,6 +196,23 @@ public:
 	typedef ring_buffer_iterator<T, true> reverse_iterator;
 	typedef ring_buffer_iterator<const T, true> const_reverse_iterator;
 
+private:
+	static inline bool iter_equal(const ring_buffer_iterator_base &a, const ring_buffer_iterator_base &b) noexcept
+	{
+		return (a.ring == b.ring) && (a.pos == b.pos);
+	}
+
+public:
+	friend bool operator==(const const_iterator &a, const iterator &b) noexcept
+	{
+		return ring_buffer::iter_equal(a, b);
+	}
+
+	friend bool operator==(const const_reverse_iterator &a, const reverse_iterator &b) noexcept
+	{
+		return ring_buffer::iter_equal(a, b);
+	}
+
 	ring_buffer() = default;
 
 	template <typename U>
@@ -302,11 +313,6 @@ public:
 		return true;
 	}
 
-	bool operator != (const ring_buffer &other) const
-	{
-		return !operator ==(other);
-	}
-
 	size_t size() const
 	{
 		return this->count;