From 25f2d02c617895989b728ebe47480d2459e8f609 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 30 May 2018 10:07:22 -0700 Subject: [PATCH] fcoll/dynamic_gen2: minor compiler warning stomp Signed-off-by: Jeff Squyres --- .../mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c b/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c index 3d2ce6b39d..8ec536bcb7 100644 --- a/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c +++ b/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c @@ -13,6 +13,7 @@ * Copyright (c) 2015-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2018 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -1162,7 +1163,7 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i int block_index = -1; int blocklength_size = INIT_LEN; - ptrdiff_t send_mem_address = NULL; + ptrdiff_t send_mem_address = (ptrdiff_t) NULL; ompi_datatype_t *newType = MPI_DATATYPE_NULL; blocklength_proc = (int *) calloc (blocklength_size, sizeof (int)); displs_proc = (ptrdiff_t *) calloc (blocklength_size, sizeof (ptrdiff_t));