Skip to content

Commit 638c008

Browse files
committed
Fix compiler errors in continuation.c
Signed-off-by: Joseph Schuchart <[email protected]>
1 parent 7542ec0 commit 638c008

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ompi/mpiext/continue/c/continuation.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ static void init_tl_data(thread_local_data_t* tld)
218218

219219
}
220220

221-
static __opal_attribute_always_inline__ inline
222-
thread_local_data_t* get_tl_data()
221+
static inline __opal_attribute_always_inline__
222+
thread_local_data_t* get_tl_data(void)
223223
{
224224
static opal_thread_local thread_local_data_t tl_data = { .in_progress = false, .is_initialized = false };
225225
/* process global tl_data if threads are disabled */
@@ -304,9 +304,11 @@ void ompi_continue_cont_release(ompi_continuation_t *cont, int rc)
304304
static inline
305305
int ompi_continue_cont_invoke(ompi_continuation_t *cont)
306306
{
307+
#ifndef NDEBUG
307308
ompi_cont_request_t *cont_req = cont->cont_req;
308309
assert(NULL != cont_req);
309310
assert(OMPI_REQUEST_CONT == cont_req->super.req_type);
311+
#endif // NDEBUG
310312

311313
MPIX_Continue_cb_function *fn = cont->cont_cb;
312314
void *cont_data = cont->cont_data;
@@ -361,13 +363,13 @@ int ompi_continue_progress_n(const uint32_t max, thread_local_data_t *tld)
361363
return completed;
362364
}
363365

364-
static int ompi_continue_progress_callback()
366+
static int ompi_continue_progress_callback(void)
365367
{
366368
thread_local_data_t *tld = get_tl_data();
367369
return ompi_continue_progress_n(1, tld);
368370
}
369371

370-
static int ompi_continue_wait_progress_callback()
372+
static int ompi_continue_wait_progress_callback(void)
371373
{
372374
thread_local_data_t *tld = get_tl_data();
373375
return ompi_continue_progress_n(UINT32_MAX, tld);
@@ -831,8 +833,6 @@ int ompi_continue_global_wakeup(int status) {
831833
for (int i = 0; i < cont->cont_num_opreqs; ++i) {
832834
ompi_request_t *request = cont->cont_opreqs[i];
833835
if (MPI_REQUEST_NULL == request) continue;
834-
ompi_request_cont_data_t *req_cont_data;
835-
req_cont_data = (ompi_request_cont_data_t *)request->req_complete_cb_data;
836836
if (ompi_request_is_failed(request) && opal_atomic_compare_exchange_strong_32(&cont->cont_failed, &failed_tmp, 1)) {
837837
handle_failed_cont(cont, status, true);
838838
break;
@@ -1132,7 +1132,7 @@ static inline __opal_attribute_always_inline__
11321132
int ompi_continue_check_errhandler_abort(ompi_errhandler_t* errhandler)
11331133
{
11341134
/* it's safe to use binary OR here, safes a jmp */
1135-
return (errhandler == &ompi_mpi_errors_are_fatal.eh | errhandler == &ompi_mpi_errors_abort.eh);
1135+
return ((errhandler == &ompi_mpi_errors_are_fatal.eh) | (errhandler == &ompi_mpi_errors_abort.eh));
11361136
}
11371137

11381138
static inline

0 commit comments

Comments
 (0)