Remove UB from thread-id relational operators

STEllAR-GROUP · Jan 17, 2018 · a01a742 · a01a742
1 parent 26fa6ed
commit a01a742
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/hpx/runtime/threads/thread.hpp b/hpx/runtime/threads/thread.hpp
@@ -16,6 +16,7 @@
 #include <hpx/util_fwd.hpp>
 
 #include <cstddef>
+#include <functional>
 #include <iosfwd>
 #include <mutex>
 #include <utility>
@@ -149,7 +150,7 @@ namespace hpx
 
     inline bool operator== (thread::id const& x, thread::id const& y) noexcept
     {
-        return x.id_.get() == y.id_.get();
+        return x.id_ == y.id_;
     }
 
     inline bool operator!= (thread::id const& x, thread::id const& y) noexcept
@@ -159,22 +160,22 @@ namespace hpx
 
     inline bool operator< (thread::id const& x, thread::id const& y) noexcept
     {
-        return x.id_.get() < y.id_.get();
+        return x.id_ < y.id_;
     }
 
     inline bool operator> (thread::id const& x, thread::id const& y) noexcept
     {
-        return x.id_.get() > y.id_.get();
+        return y < x;
     }
 
     inline bool operator<= (thread::id const& x, thread::id const& y) noexcept
     {
-        return !(x.id_.get() > y.id_.get());
+        return !(x > y);
     }
 
     inline bool operator>= (thread::id const& x, thread::id const& y) noexcept
     {
-        return !(x.id_.get() < y.id_.get());
+        return !(x < y);
     }
 
     template <typename Char, typename Traits>