diff options
author | mainzer <mainzer#hdfgroup.org> | 2021-11-22 21:11:48 (GMT) |
---|---|---|
committer | mainzer <mainzer#hdfgroup.org> | 2021-11-22 21:11:48 (GMT) |
commit | 68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad (patch) | |
tree | 0ac1b135f2c8a8bd9dbb980ebdbeb36dcf89f2c2 /tools/test/h5copy/dynlib_copy.c | |
parent | 65d6d256cf9d04dbeb275025cc2b01d0f36ed3f1 (diff) | |
parent | 2a5d2a27c492170f84d89b7725df4983fe6466a8 (diff) | |
download | hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.zip hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.tar.gz hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.tar.bz2 |
Merge remote-tracking branch 'origin/selection_io' into selection_io_with_subfiling_vfd
and resolved conflicts. Note that H5S_get_validated_dataspace() in H5S.c was removed.
Re-inserted this function for now.
Update testpar/t_subfiling_vfd.c to set HD_enable_selection_io_g. Uses MPI flag on
the sub-filing VFD is still not set, as the VFD seg faults if it is.
Tested parallel / debug on Charis and Jelly.
Diffstat (limited to 'tools/test/h5copy/dynlib_copy.c')
-rw-r--r-- | tools/test/h5copy/dynlib_copy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/test/h5copy/dynlib_copy.c b/tools/test/h5copy/dynlib_copy.c index 57de3bc..b954a22 100644 --- a/tools/test/h5copy/dynlib_copy.c +++ b/tools/test/h5copy/dynlib_copy.c @@ -25,13 +25,13 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const un /* This message derives from H5Z */ const H5Z_class2_t H5Z_DYNLIBUD[1] = {{ - H5Z_CLASS_T_VERS, /* H5Z_class_t version */ - H5Z_FILTER_DYNLIBUD, /* Filter id number */ - 1, 1, /* Encoding and decoding enabled */ - "dynlibud", /* Filter name for debugging */ - NULL, /* The "can apply" callback */ - NULL, /* The "set local" callback */ - (H5Z_func_t)H5Z_filter_dynlibud, /* The actual filter function */ + H5Z_CLASS_T_VERS, /* H5Z_class_t version */ + H5Z_FILTER_DYNLIBUD, /* Filter id number */ + 1, 1, /* Encoding and decoding enabled */ + "dynlibud", /* Filter name for debugging */ + NULL, /* The "can apply" callback */ + NULL, /* The "set local" callback */ + H5Z_filter_dynlibud, /* The actual filter function */ }}; H5PL_type_t @@ -70,7 +70,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd return (0); /* Assignment to eliminate unused parameter warning. */ - cd_values = cd_values; + (void)cd_values; if (flags & H5Z_FLAG_REVERSE) { /*read*/ /* Subtract the original value with MULTIPLIER */ |