Skip to content

Commit d4ba18c

Browse files
committed
Fixup: nullptr -> NULL for GCC-14
1 parent 7f1602b commit d4ba18c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/runtime-libraries/mpi/mpi_caf.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ handle_getting(ct_msg_t *msg, int cb_image, void *baseptr, void *dst_ptr,
611611
void *src_ptr;
612612
size_t charlen, send_size;
613613
int i;
614-
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, nullptr};
614+
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, NULL};
615615

616616
if (msg->flags & CT_SRC_HAS_DESC)
617617
{
@@ -759,7 +759,7 @@ handle_is_present_message(ct_msg_t *msg, void *baseptr)
759759
int ierr = 0;
760760
void *add_data, *ptr;
761761
int32_t result;
762-
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, nullptr};
762+
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, NULL};
763763

764764
add_data = msg->data;
765765
if (msg->flags & CT_SRC_HAS_DESC)
@@ -787,7 +787,7 @@ handle_send_message(ct_msg_t *msg, void *baseptr)
787787
{
788788
int ierr = 0;
789789
void *src_ptr, *buffer, *dst_ptr, *add_data;
790-
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, nullptr};
790+
mpi_caf_token_t src_token = {(void *)msg->ra_id, MPI_WIN_NULL, NULL};
791791

792792
dprint("ct: putting data using %d accessor.\n", msg->accessor_index);
793793
buffer = msg->data;
@@ -5461,7 +5461,7 @@ get_from_self(caf_token_t token, const gfc_descriptor_t *opt_src_desc,
54615461
? (dst_incl_desc ? opt_dst_desc : (void *)&tmp_desc)
54625462
: dst_data;
54635463
const bool needs_copy_back = opt_dst_desc && !may_realloc_dst;
5464-
mpi_caf_token_t src_token = {get_data, MPI_WIN_NULL, nullptr};
5464+
mpi_caf_token_t src_token = {get_data, MPI_WIN_NULL, NULL};
54655465
void *src_ptr = has_src_desc ? (void *)opt_src_desc
54665466
: ((mpi_caf_token_t *)token)->memptr;
54675467

@@ -5753,7 +5753,7 @@ PREFIX(is_present_on_remote)(caf_token_t token, const int image_index,
57535753
if (this_image == remote_image)
57545754
{
57555755
int32_t result = 0;
5756-
mpi_caf_token_t src_token = {get_data, MPI_WIN_NULL, nullptr};
5756+
mpi_caf_token_t src_token = {get_data, MPI_WIN_NULL, NULL};
57575757
void *src_ptr = ((mpi_caf_token_t *)token)->memptr;
57585758

57595759
dprint("Shortcutting due to self access on image %d.\n", image_index);
@@ -5832,7 +5832,7 @@ send_to_self(caf_token_t token, gfc_descriptor_t *opt_dst_desc,
58325832
|| (!opt_src_desc && ((mpi_caf_token_t *)token)->memptr == src_data);
58335833
void *dst_ptr
58345834
= opt_dst_desc ? opt_dst_desc : ((mpi_caf_token_t *)token)->memptr;
5835-
mpi_caf_token_t src_token = {add_data, MPI_WIN_NULL, nullptr};
5835+
mpi_caf_token_t src_token = {add_data, MPI_WIN_NULL, NULL};
58365836
const void *src_ptr = opt_src_desc ? opt_src_desc : src_data,
58375837
*orig_src_ptr = src_ptr;
58385838
const size_t sz

0 commit comments

Comments
 (0)