diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-08-24 11:48:45 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-24 11:48:45 +0200 |
| commit | 451314241dc40c4e3be600ef95a4f4fbd322f701 (patch) | |
| tree | 1c55abe5e0027df578a792015254e4b95b8e6d80 /src/server/shared | |
| parent | 343d09bc95ade0cc34f953b56cbe666baca387fc (diff) | |
Core/Misc: Modernize comparison operators
(cherry picked from commit f0a862e71bc12d86a898901ef773475a7c964832)
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/DataStores/DBCStorageIterator.h | 1 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/LinkedList.h | 28 | ||||
| -rw-r--r-- | src/server/shared/Realm/Realm.h | 6 |
3 files changed, 5 insertions, 30 deletions
diff --git a/src/server/shared/DataStores/DBCStorageIterator.h b/src/server/shared/DataStores/DBCStorageIterator.h index d4ac54bc64c..fce95e09bfa 100644 --- a/src/server/shared/DataStores/DBCStorageIterator.h +++ b/src/server/shared/DataStores/DBCStorageIterator.h @@ -45,7 +45,6 @@ public: T const* operator*() const { return _index[_pos]; } bool operator==(DBCStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; } - bool operator!=(DBCStorageIterator const& right) const { return !(*this == right); } DBCStorageIterator& operator++() { diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 0e9e44a2da4..9ace55d1874 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -160,7 +160,7 @@ class LinkedListHead { // construct with null node pointer } - Iterator(pointer _Pnode) : _Ptr(_Pnode) + explicit Iterator(pointer _Pnode) : _Ptr(_Pnode) { // construct with node pointer _Pnode } @@ -206,41 +206,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 fb19bd78d69..75f6fbb13e0 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 <memory> enum RealmFlags @@ -42,10 +43,7 @@ struct TC_SHARED_API RealmHandle uint32 Realm; // primary key in `realmlist` table - bool operator<(RealmHandle const& r) const - { - return Realm < r.Realm; - } + std::strong_ordering operator<=>(RealmHandle const& r) const { return Realm <=> r.Realm; } }; /// Type of server, this is values from second column of Cfg_Configs.dbc |