summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-16 21:52:21 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-16 21:52:21 (GMT)
commitba2f6a74d3633b5b746c2361b47dffdc60229e2f (patch)
tree2b5649ae06d5da36e9a0cddd0124dbab3dfb6261
parenta96664020809e451ddfe67928ac7163f03951d89 (diff)
parent9ee8c599d7b8cd495efb28cd9f068192712ae086 (diff)
downloadhdf5-ba2f6a74d3633b5b746c2361b47dffdc60229e2f.zip
hdf5-ba2f6a74d3633b5b746c2361b47dffdc60229e2f.tar.gz
hdf5-ba2f6a74d3633b5b746c2361b47dffdc60229e2f.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9ee8c599d7b8cd495efb28cd9f068192712ae086': More fixes for previous committed PR #2079 dated Dec 5 2019. (1) H5O_dtype_ver_bounds[] for V112 should be H5O_DTYPE_VRESION_4 (2) The tests for the new reference types should work for V112 and beyond
-rw-r--r--src/H5T.c2
-rw-r--r--test/trefer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/H5T.c b/src/H5T.c
index f378357..f1c2dbb 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -533,7 +533,7 @@ const unsigned H5O_dtype_ver_bounds[] = {
H5O_DTYPE_VERSION_1, /* H5F_LIBVER_EARLIEST */
H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V18 */
H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V110 */
- H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V112 */
+ H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V112 */
H5O_DTYPE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/test/trefer.c b/test/trefer.c
index cd09c8e..b412fc2 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -2816,7 +2816,7 @@ test_reference(void)
for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
/* Invalid combinations, just continue */
- if(high <= H5F_LIBVER_V112 || high < low)
+ if(high <= H5F_LIBVER_V110 || high < low)
continue;
test_reference_region(low, high); /* Test basic H5R dataset region reference code */