Skip to content

Changes for C++20 #9701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 1 commit into from
May 11, 2023
Merged

Changes for C++20 #9701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/tscore/List.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,10 @@ template <class C, class L = typename C::Link_link> struct DLL {
self_type operator++(int);

/// Equality.
bool operator==(self_type const &that);
bool operator==(self_type const &that) const;

/// Inequality.
bool operator!=(self_type const &that);
bool operator!=(self_type const &that) const;

protected:
const_iterator(C *spot) : _spot(spot) {}
Expand Down Expand Up @@ -515,14 +515,14 @@ DLL<C, L>::const_iterator::operator++(int) -> self_type

template <class C, class L>
bool
DLL<C, L>::const_iterator::operator==(DLL::const_iterator::self_type const &that)
DLL<C, L>::const_iterator::operator==(DLL::const_iterator::self_type const &that) const
{
return _spot == that._spot;
}

template <class C, class L>
bool
DLL<C, L>::const_iterator::operator!=(DLL::const_iterator::self_type const &that)
DLL<C, L>::const_iterator::operator!=(DLL::const_iterator::self_type const &that) const
{
return _spot != that._spot;
}
Expand Down
2 changes: 1 addition & 1 deletion include/tscore/Ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ template <class T> class Ptr
}

bool
operator==(const Ptr<T> &p)
operator==(const Ptr<T> &p) const
{
return (m_ptr == p.m_ptr);
}
Expand Down
2 changes: 1 addition & 1 deletion iocore/eventsystem/I_IOBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ IOBufferChain::operator=(self_type const &that)
inline IOBufferChain &
IOBufferChain::operator+=(self_type const &that)
{
if (nullptr == _head)
if (_head == nullptr)
*this = that;
else {
_tail->next = that._head;
Expand Down
4 changes: 2 additions & 2 deletions plugins/s3_auth/aws_auth_v4_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ class HeaderIterator
return tmp;
}
bool
operator!=(const HeaderIterator &it)
operator!=(const HeaderIterator &it) const
{
return _bufp != it._bufp || _hdrs != it._hdrs || _field != it._field;
}
bool
operator==(const HeaderIterator &it)
operator==(const HeaderIterator &it) const
{
return _bufp == it._bufp && _hdrs == it._hdrs && _field == it._field;
}
Expand Down
8 changes: 4 additions & 4 deletions proxy/hdrs/MIME.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ struct MIMEHdrImpl : public HdrHeapObjImpl {
self_type &operator++();
self_type operator++(int);

bool operator==(self_type const &that);
bool operator!=(self_type const &that);
bool operator==(self_type const &that) const;
bool operator!=(self_type const &that) const;

protected:
MIMEFieldBlockImpl *_block = nullptr; ///< Current block.
Expand Down Expand Up @@ -384,13 +384,13 @@ MIMEHdrImpl::iterator::operator->() -> pointer
}

inline bool
MIMEHdrImpl::iterator::operator==(const self_type &that)
MIMEHdrImpl::iterator::operator==(const self_type &that) const
{
return _block == that._block && _slot == that._slot;
}

inline bool
MIMEHdrImpl::iterator::operator!=(const self_type &that)
MIMEHdrImpl::iterator::operator!=(const self_type &that) const
{
return _block != that._block || _slot != that._slot;
}
Expand Down