Fixing HPX compilation errors

STEllAR-GROUP · Jul 14, 2023 · b0f1f25 · b0f1f25
1 parent 88b431b
commit b0f1f25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/libs/core/gasnet_base/src/gasnet_environment.cpp b/libs/core/gasnet_base/src/gasnet_environment.cpp
@@ -206,7 +206,8 @@ static inline void wait_done_obj(done_t* done, bool do_yield)
         am_poll_try();
         if (do_yield)
         {
-            this_thread::suspend(threads::thread_schedule_state::pending,
+            hpx::this_thread::suspend(
+                hpx::threads::thread_schedule_state::pending,
                 "gasnet::wait_done_obj");
         }
     }
@@ -301,39 +302,39 @@ namespace hpx::util {
 
         if (gasnet_environment::init_val_ == GASNET_ERR_NOT_INIT)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::init",
                 "GASNET initialization error");
         }
         else if (gasnet_environment::init_val_ == GASNET_ERR_RESOURCE)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::vinvalid_status,
                 "hpx::util::gasnet_environment::init", "GASNET resource error");
         }
         else if (gasnet_environment::init_val_ == GASNET_ERR_BAD_ARG)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::init",
                 "GASNET bad argument error");
         }
         else if (gasnet_environment::init_val_ == GASNET_ERR_NOT_READY)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::init",
                 "GASNET not ready error");
         }
 
         if (provided < minimal)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::init",
                 "GASNET doesn't provide minimal requested thread level");
         }
 
         if (gasnet_attach(nullptr, 0, gasnet_getMaxLocalSegmentSize(), 0) !=
             GASNET_OK)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::init",
                 "GASNET failed to attach to memory");
         }
@@ -441,7 +442,7 @@ namespace hpx::util {
         const int len = rnkstr.size();
         if (1025 < len)
         {
-            HPX_THROW_EXCEPTION(invalid_status,
+            HPX_THROW_EXCEPTION(error::invalid_status,
                 "hpx::util::gasnet_environment::get_processor_name",
                 "GASNET processor name is larger than 1025");
         }

diff --git a/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp b/libs/full/parcelport_gasnet/src/parcelport_gasnet.cpp
@@ -170,7 +170,7 @@ namespace hpx::parcelset {
                              0, GASNET_BARRIERFLAG_ANONYMOUS)) != GASNET_OK)
                     {
                         // throw exception
-                        HPX_THROW_EXCEPTION(invalid_status,
+                        HPX_THROW_EXCEPTION(error::invalid_status,
                             "hpx::util::gasnet_environment::init",
                             "GASNET failed ",
                             std::string{gasnet_ErrorName(retval)}, " ",