Skip to content

Commit bb7ecde

Browse files
authored
Merge pull request #12474 from hppritcha/fix_for_pr12465
comm/cid: keep Intel OneAPI compiler happy
2 parents ae7fe9a + 574778d commit bb7ecde

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

ompi/communicator/comm_cid.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* Copyright (c) 2017 Mellanox Technologies. All rights reserved.
2525
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
2626
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
27-
* Copyright (c) 2020-2022 Triad National Security, LLC. All rights
27+
* Copyright (c) 2020-2024 Triad National Security, LLC. All rights
2828
* reserved.
2929
* $COPYRIGHT$
3030
*
@@ -590,7 +590,7 @@ static int ompi_comm_allreduce_getnextcid (ompi_comm_request_t *request)
590590
context->nextlocal_cid = mca_pml.pml_max_contextid;
591591
for (unsigned int i = context->start ; i < mca_pml.pml_max_contextid ; ++i) {
592592
flag = opal_pointer_array_test_and_set_item (&ompi_mpi_communicators, i,
593-
OMPI_COMM_SENTINEL);
593+
(void *)OMPI_COMM_SENTINEL);
594594
if (true == flag) {
595595
context->nextlocal_cid = i;
596596
break;
@@ -664,7 +664,8 @@ static int ompi_comm_checkcid (ompi_comm_request_t *request)
664664
opal_pointer_array_set_item(&ompi_mpi_communicators, context->nextlocal_cid, NULL);
665665

666666
context->flag = opal_pointer_array_test_and_set_item (&ompi_mpi_communicators,
667-
context->nextcid, OMPI_COMM_SENTINEL);
667+
context->nextcid,
668+
(void *)OMPI_COMM_SENTINEL);
668669
}
669670
}
670671

@@ -716,7 +717,7 @@ static int ompi_comm_nextcid_check_flag (ompi_comm_request_t *request)
716717
for (unsigned int i = context->start ; i < mca_pml.pml_max_contextid ; ++i) {
717718
bool flag;
718719
flag = opal_pointer_array_test_and_set_item (&ompi_mpi_communicators, i,
719-
OMPI_COMM_SENTINEL);
720+
(void *)OMPI_COMM_SENTINEL);
720721
if (true == flag) {
721722
context->nextlocal_cid = i;
722723
break;

0 commit comments

Comments
 (0)