Skip to content

Commit d840b49

Browse files
committed
osc/rdma: fix for intel oneapi compiler
without this patch, file no longer compiles using latest Intel OneAPI compilers: osc_rdma_accumulate.c:142:41: error: incompatible integer to poin ter conversion passing 'uint64_t' (aka 'unsigned long') to parame ter of type 'void *' [-Wint-conversion] 14807 target_is_accel = osc_rdma_is_accel(target_address); 14808 ^~~~~~~~~~~~~~ Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent 4e8bc42 commit d840b49

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ompi/mca/osc/rdma/osc_rdma_accumulate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2016-2019 Research Organization for Information Science
66
* and Technology (RIST). All rights reserved.
77
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
8-
* Copyright (c) 2019 Triad National Security, LLC. All rights
8+
* Copyright (c) 2019-2022 Triad National Security, LLC. All rights
99
* reserved.
1010
* Copyright (c) 2019-2021 Google, LLC. All rights reserved.
1111
* Copyright (c) 2021 IBM Corporation. All rights reserved.
@@ -139,7 +139,7 @@ static inline int ompi_osc_rdma_cas_local (const void *source_addr, const void *
139139

140140
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "performing compare-and-swap with local regions");
141141
result_is_accel = osc_rdma_is_accel(result_addr);
142-
target_is_accel = osc_rdma_is_accel(target_address);
142+
target_is_accel = osc_rdma_is_accel((void *)target_address);
143143
compare_is_accel = osc_rdma_is_accel(compare_addr);
144144
if (0 < result_is_accel || 0 < target_is_accel) {
145145
ret = opal_accelerator.mem_copy(MCA_ACCELERATOR_NO_DEVICE_ID, MCA_ACCELERATOR_NO_DEVICE_ID,

0 commit comments

Comments
 (0)