Progress.

include/boost_mpi_extensions/mpi_detach.hpp

@@ -184,12 +184,8 @@ struct state
 inline std::optional<state> global_state; // Note: External-linkage optional used as a lazy-initialized stack variable. Must be reset prior to MPI_Finalize.
 }
 
-typedef void MPI_Detach_callback         (void*);
-typedef void MPI_Detach_callback_status  (void*,               MPI_Status*);
-typedef void MPI_Detach_callback_statuses(void*, std::int32_t, MPI_Status*);
-
 // Note: If the test does not succeed immediately, takes the ownership of the request and invalidates it.
-inline std::int32_t MPI_Detach            (                    MPI_Request* request , MPI_Detach_callback*          callback, void*  data)
+inline std::int32_t MPI_Detach            (                    MPI_Request* request , std::function<void(void*)>                            callback, void*  data)
 {
   if (!detail::global_state) detail::global_state.emplace();
 
@@ -209,7 +205,7 @@ inline std::int32_t MPI_Detach            (                    MPI_Request* requ
   return MPI_SUCCESS;
 }
 // Note: If the test does not succeed immediately, takes the ownership of the request and invalidates it.                                   
-inline std::int32_t MPI_Detach_status     (                    MPI_Request* request , MPI_Detach_callback_status*   callback, void*  data)
+inline std::int32_t MPI_Detach_status     (                    MPI_Request* request , std::function<void(void*,               MPI_Status*)> callback, void*  data)
 {
   if (!detail::global_state) detail::global_state.emplace();
 
@@ -230,7 +226,7 @@ inline std::int32_t MPI_Detach_status     (                    MPI_Request* requ
   return MPI_SUCCESS;
 }
 // Note: If the test does not succeed immediately, takes the ownership of the requests and invalidates them.                                
-inline std::int32_t MPI_Detach_each       (std::int32_t count, MPI_Request* requests, MPI_Detach_callback*          callback, void** data)
+inline std::int32_t MPI_Detach_each       (std::int32_t count, MPI_Request* requests, std::function<void(void*)>                            callback, void** data)
 {
   if (!detail::global_state) detail::global_state.emplace();
 
@@ -253,7 +249,7 @@ inline std::int32_t MPI_Detach_each       (std::int32_t count, MPI_Request* requ
   return MPI_SUCCESS;
 }
 // Note: If the test does not succeed immediately, takes the ownership of the requests and invalidates them.                                
-inline std::int32_t MPI_Detach_each_status(std::int32_t count, MPI_Request* requests, MPI_Detach_callback_status*   callback, void** data)
+inline std::int32_t MPI_Detach_each_status(std::int32_t count, MPI_Request* requests, std::function<void(void*,               MPI_Status*)> callback, void** data)
 {
   if (!detail::global_state) detail::global_state.emplace();
 
@@ -277,7 +273,7 @@ inline std::int32_t MPI_Detach_each_status(std::int32_t count, MPI_Request* requ
   return MPI_SUCCESS;
 }
 // Note: If the test does not succeed immediately, takes the ownership of the requests and invalidates them.                                
-inline std::int32_t MPI_Detach_all        (std::int32_t count, MPI_Request* requests, MPI_Detach_callback*          callback, void*  data)
+inline std::int32_t MPI_Detach_all        (std::int32_t count, MPI_Request* requests, std::function<void(void*)>                            callback, void*  data)
 {
   if (!detail::global_state) detail::global_state.emplace();
 
@@ -298,7 +294,7 @@ inline std::int32_t MPI_Detach_all        (std::int32_t count, MPI_Request* requ
   return MPI_SUCCESS;
 }
 // Note: If the test does not succeed immediately, takes the ownership of the requests and invalidates them.                                
-inline std::int32_t MPI_Detach_all_status (std::int32_t count, MPI_Request* requests, MPI_Detach_callback_statuses* callback, void*  data)
+inline std::int32_t MPI_Detach_all_status (std::int32_t count, MPI_Request* requests, std::function<void(void*, std::int32_t, MPI_Status*)> callback, void*  data)
 {
   if (!detail::global_state) detail::global_state.emplace();