From ac061bd2a140e19d7e89e446eb4801bb989c4dc2 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Sat, 2 Dec 2023 13:23:21 -0600
Subject: [PATCH] Fixing testing issues

---
 .../include/hpx/parallel/util/adapt_thread_priority.hpp    | 7 +++----
 .../hpx/lock_registration/detail/register_locks.hpp        | 2 +-
 .../include/hpx/synchronization/shared_mutex.hpp           | 4 +++-
 .../include/hpx/components_base/server/wrapper_heap.hpp    | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libs/core/algorithms/include/hpx/parallel/util/adapt_thread_priority.hpp b/libs/core/algorithms/include/hpx/parallel/util/adapt_thread_priority.hpp
index 8824a4edf283..fca3305632c0 100644
--- a/libs/core/algorithms/include/hpx/parallel/util/adapt_thread_priority.hpp
+++ b/libs/core/algorithms/include/hpx/parallel/util/adapt_thread_priority.hpp
@@ -23,10 +23,9 @@ namespace hpx::parallel::util {
     decltype(auto) adapt_thread_priority(
         ExPolicy&& policy, hpx::threads::thread_priority new_priority)
     {
-        constexpr bool supports_priority =
-            hpx::functional::is_tag_invocable_v<
-                hpx::execution::experimental::with_priority_t,
-                std::decay_t<ExPolicy>, hpx::threads::thread_priority>;
+        constexpr bool supports_priority = hpx::functional::is_tag_invocable_v<
+            hpx::execution::experimental::with_priority_t,
+            std::decay_t<ExPolicy>, hpx::threads::thread_priority>;
 
         if constexpr (supports_priority)
         {
diff --git a/libs/core/lock_registration/include/hpx/lock_registration/detail/register_locks.hpp b/libs/core/lock_registration/include/hpx/lock_registration/detail/register_locks.hpp
index c2bee64e2839..e043eb33711c 100644
--- a/libs/core/lock_registration/include/hpx/lock_registration/detail/register_locks.hpp
+++ b/libs/core/lock_registration/include/hpx/lock_registration/detail/register_locks.hpp
@@ -139,7 +139,7 @@ namespace hpx::util {
 
     // The following functions are used to store the held locks information
     // during thread suspension. The data is stored on a thread_local basis,
-    // so we must make sure that locks the are being ignored are restored
+    // so we must make sure that locks that are being ignored are restored
     // after suspension even if the thread is being resumed on a different core.
 
     // retrieve the current thread_local data about held locks
diff --git a/libs/core/synchronization/include/hpx/synchronization/shared_mutex.hpp b/libs/core/synchronization/include/hpx/synchronization/shared_mutex.hpp
index 1b3d5105ac93..ddb55e4a7b75 100644
--- a/libs/core/synchronization/include/hpx/synchronization/shared_mutex.hpp
+++ b/libs/core/synchronization/include/hpx/synchronization/shared_mutex.hpp
@@ -12,7 +12,8 @@
 
 #include <hpx/config.hpp>
 #include <hpx/concurrency/cache_line_data.hpp>
-#include <hpx/memory/intrusive_ptr.hpp>
+#include <hpx/lock_registration/detail/register_locks.hpp>
+#include <hpx/modules/memory.hpp>
 #include <hpx/synchronization/detail/condition_variable.hpp>
 #include <hpx/synchronization/spinlock.hpp>
 #include <hpx/thread_support/assert_owns_lock.hpp>
@@ -65,6 +66,7 @@ namespace hpx::detail {
 
         void release_waiters(std::unique_lock<mutex_type>& lk)
         {
+            [[maybe_unused]] util::ignore_while_checking il(&lk);
             exclusive_cond.notify_one_no_unlock(lk);
             shared_cond.notify_all(HPX_MOVE(lk));
         }
diff --git a/libs/full/components_base/include/hpx/components_base/server/wrapper_heap.hpp b/libs/full/components_base/include/hpx/components_base/server/wrapper_heap.hpp
index 130890293b52..da178ca5c8e7 100644
--- a/libs/full/components_base/include/hpx/components_base/server/wrapper_heap.hpp
+++ b/libs/full/components_base/include/hpx/components_base/server/wrapper_heap.hpp
@@ -16,6 +16,7 @@
 #include <hpx/naming_base/id_type.hpp>
 #include <hpx/synchronization/spinlock.hpp>
 
+#include <atomic>
 #include <cstddef>
 #include <cstdint>
 #include <memory>