diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-08-24 00:51:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-24 00:51:26 +0200 |
| commit | f0a862e71bc12d86a898901ef773475a7c964832 (patch) | |
| tree | d0dde0ae128a81734d0a2566aef34393b4bdecb3 /src/server/shared | |
| parent | f108a50abf82abd0973878ef88fdab47a408238c (diff) | |
Core/Misc: Modernize comparison operators
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/DataStores/DBStorageIterator.h | 1 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/LinkedList.h | 28 | ||||
| -rw-r--r-- | src/server/shared/Realm/Realm.h | 8 |
3 files changed, 7 insertions, 30 deletions
diff --git a/src/server/shared/DataStores/DBStorageIterator.h b/src/server/shared/DataStores/DBStorageIterator.h index 109acac6779..6df777c76c9 100644 --- a/src/server/shared/DataStores/DBStorageIterator.h +++ b/src/server/shared/DataStores/DBStorageIterator.h @@ -45,7 +45,6 @@ public: T const* operator*() const { return _index[_pos]; } bool operator==(DBStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; } - bool operator!=(DBStorageIterator const& right) const { return !(*this == right); } DBStorageIterator& operator++() { diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index ce1fb314329..b32710910a9 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -162,7 +162,7 @@ class LinkedListHead { // construct with null node pointer } - Iterator(pointer _Pnode) : _Ptr(_Pnode) + explicit Iterator(pointer _Pnode) : _Ptr(_Pnode) { // construct with node pointer _Pnode } @@ -208,41 +208,19 @@ class LinkedListHead return (_Tmp); } - bool operator==(Iterator const& _Right) const - { // test for iterator equality - return (_Ptr == _Right._Ptr); - } - - bool operator!=(Iterator const& _Right) const - { // test for iterator inequality - return (!(*this == _Right)); - } + bool operator==(Iterator const& _Right) const = default; + // test for iterator equality bool operator==(pointer const& _Right) const { // test for pointer equality return (_Ptr != _Right); } - bool operator!=(pointer const& _Right) const - { // test for pointer equality - return (!(*this == _Right)); - } - bool operator==(const_reference _Right) const { // test for reference equality return (_Ptr == &_Right); } - bool operator!=(const_reference _Right) const - { // test for reference equality - return (_Ptr != &_Right); - } - - pointer _Mynode() - { // return node pointer - return (_Ptr); - } - protected: pointer _Ptr; // pointer to node }; diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h index a51f4550051..9dcbb581538 100644 --- a/src/server/shared/Realm/Realm.h +++ b/src/server/shared/Realm/Realm.h @@ -20,6 +20,7 @@ #include "Common.h" #include "AsioHacksFwd.h" +#include <compare> #include <vector> enum RealmFlags @@ -48,10 +49,9 @@ namespace Battlenet uint8 Site; uint32 Realm; // primary key in `realmlist` table - bool operator<(RealmHandle const& r) const - { - return Realm < r.Realm; - } + bool operator==(RealmHandle const& r) const { return Realm == r.Realm; } + + std::strong_ordering operator<=>(RealmHandle const& r) const { return Realm <=> r.Realm; } uint32 GetAddress() const { return (Region << 24) | (Site << 16) | uint16(Realm); } std::string GetAddressString() const; |