Merge remote-tracking branch 'origin/master' into release

STEllAR-GROUP · Jan 27, 2021 · dd15712 · dd15712
2 parents 405b198 + 7226dda
commit dd15712
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/libs/core/threading_base/include/hpx/threading_base/threading_base_fwd.hpp b/libs/core/threading_base/include/hpx/threading_base/threading_base_fwd.hpp
@@ -18,6 +18,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <utility>
 

diff --git a/libs/parallelism/threading/include/hpx/threading/thread.hpp b/libs/parallelism/threading/include/hpx/threading/thread.hpp
@@ -21,6 +21,7 @@
 
 #include <cstddef>
 #include <exception>
+#include <functional>
 #include <iosfwd>
 #include <mutex>
 #include <type_traits>
@@ -310,4 +311,18 @@ namespace hpx {
     }    // namespace this_thread
 }    // namespace hpx
 
+namespace std {
+
+    // specialize std::hash for hpx::thread::id
+    template <>
+    struct hash<::hpx::thread::id>
+    {
+        std::size_t operator()(::hpx::thread::id const& id) const
+        {
+            std::hash<::hpx::threads::thread_id_type> hasher_;
+            return hasher_(id.native_handle());
+        }
+    };
+}    // namespace std
+
 #include <hpx/config/warnings_suffix.hpp>