From b7f660f432c2f738f79be7bc0f9a056b61664844 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 7 Jan 2019 14:34:30 -0600 Subject: Correct another git merge failure. --- src/H5CX.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/H5CX.c b/src/H5CX.c index a46dde9..0d20132 100644 --- a/src/H5CX.c +++ b/src/H5CX.c @@ -2730,6 +2730,7 @@ H5CX__pop_common(void) H5CX_SET_PROP(H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME, mpio_coll_chunk_link_num_true) H5CX_SET_PROP(H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME, mpio_coll_chunk_link_num_false) H5CX_SET_PROP(H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, mpio_coll_chunk_multi_ratio_coll) + H5CX_SET_PROP(H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME, mpio_coll_chunk_multi_ratio_ind) H5CX_SET_PROP(H5D_XFER_COLL_RANK0_BCAST_NAME, mpio_coll_rank0_bcast) #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ #endif /* H5_HAVE_PARALLEL */ -- cgit v0.12