Patching recently introduced issues on Windows/MSVC

Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>

Author: hkaiser

.jenkins/lsu/env-clang-18.sh

@@ -40,6 +40,4 @@ configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON"
 # Make sure HWLOC does not report 'cores'. This is purely an option to enable
 # testing the topology code under conditions close to those on FreeBSD.
 configure_extra_options+=" -DHPX_TOPOLOGY_WITH_ADDITIONAL_HWLOC_TESTING=ON"
-
 configure_extra_options+=" -DHPX_COROUTINES_WITH_THREAD_SCHEDULE_HINT_RUNS_AS_CHILD=ON"
-configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-mc"

.jenkins/lsu/env-gcc-14.sh

@@ -40,4 +40,4 @@ configure_extra_options+=" -DHPX_LIKWID_WITH_LIKWID=ON"
 configure_extra_options+=" -DHPX_COROUTINES_WITH_THREAD_SCHEDULE_HINT_RUNS_AS_CHILD=ON"
 
 # also enable additional handshaking in MPI parcelport
-configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-mc --hpx:ini=hpx.parcel.mpi.ack_handshake!=1"
+configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:ini=hpx.parcel.mpi.ack_handshake!=1"

libs/core/coroutines/include/hpx/coroutines/thread_id_type.hpp

@@ -32,8 +32,8 @@ namespace hpx::threads {
     public:
         constexpr thread_id() noexcept = default;
 
-        thread_id(thread_id const&) = default;
-        thread_id& operator=(thread_id const&) = default;
+        thread_id(thread_id const&) noexcept = default;
+        thread_id& operator=(thread_id const&) noexcept = default;
 
         ~thread_id() = default;
 
@@ -52,11 +52,11 @@ namespace hpx::threads {
             return *this;
         }
 
-        explicit constexpr thread_id(thread_id_repr thrd) noexcept
+        explicit constexpr thread_id(thread_id_repr const thrd) noexcept
           : thrd_(thrd)
         {
         }
-        constexpr thread_id& operator=(thread_id_repr rhs) noexcept
+        constexpr thread_id& operator=(thread_id_repr const rhs) noexcept
         {
             thrd_ = rhs;
             return *this;
@@ -164,7 +164,7 @@ namespace hpx::threads {
             // created thread will be held alive by the variable returned from
             // the creation function;
             explicit constexpr thread_data_reference_counting(
-                thread_id_addref addref = thread_id_addref::yes) noexcept
+                thread_id_addref const addref = thread_id_addref::yes) noexcept
               : count_(addref == thread_id_addref::yes ? 1 : 0)
             {
             }
@@ -232,7 +232,7 @@ namespace hpx::threads {
         using thread_repr = detail::thread_data_reference_counting;
 
         explicit thread_id_ref(thread_repr* thrd,
-            thread_id_addref addref = thread_id_addref::yes) noexcept
+            thread_id_addref const addref = thread_id_addref::yes) noexcept
           : thrd_(thrd, addref == thread_id_addref::yes)
         {
         }
@@ -296,7 +296,7 @@ namespace hpx::threads {
             thrd_.reset();
         }
 
-        void reset(thread_repr* thrd, bool add_ref = true) noexcept
+        void reset(thread_repr* thrd, bool const add_ref = true) noexcept
         {
             thrd_.reset(thrd, add_ref);
         }

libs/core/itt_notify/include/hpx/itt_notify/api.hpp

@@ -136,7 +136,7 @@ HPX_CXX_CORE_EXPORT HPX_CORE_EXPORT void itt_metadata_add(
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx::threads {
 
-    struct thread_description;
+    HPX_CXX_CORE_EXPORT struct HPX_CORE_EXPORT thread_description;
 }    // namespace hpx::threads
 
 namespace hpx::util::itt {
@@ -692,7 +692,7 @@ HPX_CXX_CORE_EXPORT constexpr void itt_metadata_add(
 //////////////////////////////////////////////////////////////////////////////
 namespace hpx::threads {
 
-    struct thread_description;
+    HPX_CXX_CORE_EXPORT struct HPX_CORE_EXPORT thread_description;
 }    // namespace hpx::threads
 
 namespace hpx::util::itt {

libs/core/threading_base/include/hpx/threading_base/thread_description.hpp

@@ -225,7 +225,7 @@ namespace hpx::threads {
 
     private:
         // expose for ABI compatibility reasons
-        HPX_CORE_EXPORT void init_from_alternative_name(char const* altname);
+        void init_from_alternative_name(char const* altname);
 
     public:
         thread_description() noexcept = default;

libs/core/threading_base/include/hpx/threading_base/threading_base_fwd.hpp

@@ -24,18 +24,19 @@ namespace hpx::tracing {
 
 namespace hpx::threads {
 
-    HPX_CXX_CORE_EXPORT class HPX_CORE_EXPORT
-        thread_data;    // forward declaration only
+    // forward declaration only
+    HPX_CXX_CORE_EXPORT class HPX_CORE_EXPORT thread_data;
     HPX_CXX_CORE_EXPORT class thread_data_stackful;
     HPX_CXX_CORE_EXPORT class thread_data_stackless;
 
     HPX_CXX_CORE_EXPORT class thread_init_data;
-    HPX_CXX_CORE_EXPORT struct thread_description;
+    HPX_CXX_CORE_EXPORT struct HPX_CORE_EXPORT thread_description;
 
     namespace policies {
 
         HPX_CXX_CORE_EXPORT struct HPX_CORE_EXPORT scheduler_base;
-    }
+    }    // namespace policies
+
     HPX_CXX_CORE_EXPORT class HPX_CORE_EXPORT thread_pool_base;
 
     /// \cond NOINTERNAL

libs/core/tracing/include/hpx/tracing/tracing.hpp

@@ -41,13 +41,17 @@
 /// - \b sample_counter: Updates a registered metric with a new double value.
 #endif
 
+#if defined(HPX_HAVE_MODULE_TRACING)
+
 namespace hpx::threads {
-    HPX_CORE_EXPORT struct thread_description;
-    HPX_CORE_EXPORT struct thread_id;
+
+    HPX_CXX_CORE_EXPORT struct thread_description;
+    HPX_CXX_CORE_EXPORT struct thread_id;
 }    // namespace hpx::threads
 
 namespace hpx::util::external_timer {
-    HPX_CORE_EXPORT struct task_wrapper;
+
+    HPX_CXX_CORE_EXPORT struct task_wrapper;
 }    // namespace hpx::util::external_timer
 
 #if defined(HPX_HAVE_TRACY)
@@ -59,3 +63,5 @@ namespace hpx::util::external_timer {
 #else
 #include <hpx/tracing/backends/empty.hpp>
 #endif
+
+#endif