Skip to content

Commit 4f81935

Browse files
authored
Merge pull request #8525 from rhc54/topic/oops
Replace opal_status_t with pmix_status_t
2 parents d76787d + e3a7cbe commit 4f81935

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ompi/communicator/comm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
16531653
#endif
16541654
goto err_exit;
16551655
}
1656-
OBJ_RELEASE(sbuf);
1656+
PMIX_DATA_BUFFER_RELEASE(sbuf);
16571657
}
16581658

16591659
/* broadcast name list to all proceses in local_comm */

opal/mca/common/ofi/common_ofi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (c) 2020 Triad National Security, LLC. All rights
66
* reserved.
77
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
8+
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
89
* $COPYRIGHT$
910
*
1011
* Additional copyrights may follow
@@ -304,7 +305,7 @@ static uint32_t get_package_rank(opal_process_info_t *process_info)
304305
uint16_t current_package_rank = 0;
305306
uint16_t package_ranks[process_info->num_local_peers];
306307
opal_process_name_t pname;
307-
opal_status_t rc;
308+
pmix_status_t rc;
308309
char **peers = NULL;
309310
char *local_peers = NULL;
310311
char *locality_string = NULL;

0 commit comments

Comments
 (0)