diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2019-01-07 20:34:30 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-01-07 22:09:22 (GMT) |
| commit | b7f660f432c2f738f79be7bc0f9a056b61664844 (patch) | |
| tree | 6a9804ae24821ffa4d77b86282b00cd273b10385 | |
| parent | a6fe79251b67ec7726a7015be54033c9c98fa92d (diff) | |
| download | hdf5-b7f660f432c2f738f79be7bc0f9a056b61664844.zip hdf5-b7f660f432c2f738f79be7bc0f9a056b61664844.tar.gz hdf5-b7f660f432c2f738f79be7bc0f9a056b61664844.tar.bz2 | |
Correct another git merge failure.
| -rw-r--r-- | src/H5CX.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 */ |