Core/Misc: Modernize comparison operators

2 files changed, 7 insertions, 15 deletions

diff --git a/src/common/Utilities/SmartEnum.h b/src/common/Utilities/SmartEnum.h
index 24e3c60bd30..3c58d433406 100644
--- a/src/common/Utilities/SmartEnum.h
+++ b/src/common/Utilities/SmartEnum.h
@@ -85,13 +85,10 @@ class EnumUtils
                 Iterator() : _index(EnumUtils::Count<Enum>()) {}
                 explicit Iterator(size_t index) : _index(index) { }
 
-                bool operator==(const Iterator& other) const { return other._index == _index; }
-                bool operator!=(const Iterator& other) const { return !operator==(other); }
+                bool operator==(const Iterator& other) const = default;
+                std::strong_ordering operator<=>(const Iterator& other) const = default;
+
                 difference_type operator-(Iterator const& other) const { return _index - other._index; }
-                bool operator<(const Iterator& other) const { return _index < other._index; }
-                bool operator<=(const Iterator& other) const { return _index <= other._index; }
-                bool operator>(const Iterator& other) const { return _index > other._index; }
-                bool operator>=(const Iterator& other) const { return _index >= other._index; }
 
                 value_type operator[](difference_type d) const { return FromIndex<Enum>(_index + d); }
                 value_type operator*() const { return operator[](0); }
diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h
index ee43a203a13..aee387ea46f 100644
--- a/src/common/Utilities/TaskScheduler.h
+++ b/src/common/Utilities/TaskScheduler.h
@@ -95,18 +95,13 @@ class TC_COMMON_API TaskScheduler
         Task& operator= (Task&& right) = delete;
 
         // Order tasks by its end
-        inline bool operator< (Task const& other) const
+        std::weak_ordering operator<=> (Task const& other) const
         {
-            return _end < other._end;
-        }
-
-        inline bool operator> (Task const& other) const
-        {
-            return _end > other._end;
+            return _end <=> other._end;
         }
 
         // Compare tasks with its end
-        inline bool operator== (Task const& other)
+        bool operator== (Task const& other) const
         {
             return _end == other._end;
         }
@@ -126,7 +121,7 @@ class TC_COMMON_API TaskScheduler
         bool operator() (TaskContainer const& left, TaskContainer const& right) const
         {
             return (*left.get()) < (*right.get());
-        };
+        }
     };
 
     class TC_COMMON_API TaskQueue