dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ring buffer: Fix ambiguous comparison operators in C++20

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-22 00:14:50 +00:00
parent 56ac16c10e
commit a6635088e9
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/ring_buffer.hpp
View File

@@ -145,14 +145,8 @@ public:
return *this; return *this;
} }
bool operator ==(const ring_buffer_iterator_base &other) const friend bool operator==(const ring_buffer_iterator &a, const ring_buffer_iterator &b) noexcept {
{ return (a.ring == b.ring) && (a.pos == b.pos);
return (this->ring == other.ring) && (this->pos == other.pos);
}
bool operator !=(const ring_buffer_iterator_base &other) const
{
return !operator ==(other);
} }
ring_buffer_iterator operator +(std::ptrdiff_t delta) const 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<T, true> reverse_iterator;
typedef ring_buffer_iterator<const T, true> const_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; ring_buffer() = default;
template <typename U> template <typename U>
@@ -302,11 +313,6 @@ public:
return true; return true;
} }
bool operator != (const ring_buffer &other) const
{
return !operator ==(other);
}
size_t size() const size_t size() const
{ {
return this->count; return this->count;