summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-09-26 16:52:04 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-09-26 16:52:04 (GMT)
commita38bfab696f31d06ac9644f70f17befe78f6c2af (patch)
treecd3dd5abec4abda47b15e625fb4d12320e92d412
parent7b09c325cb352f89e0f87283e1f8c525e65755e4 (diff)
parente6b029e77e799292eb1ee074b24a224f4613a3b2 (diff)
downloadhdf5-a38bfab696f31d06ac9644f70f17befe78f6c2af.zip
hdf5-a38bfab696f31d06ac9644f70f17befe78f6c2af.tar.gz
hdf5-a38bfab696f31d06ac9644f70f17befe78f6c2af.tar.bz2
Merge pull request #1953 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e6b029e77e799292eb1ee074b24a224f4613a3b2': add missing version to list
-rw-r--r--src/H5Fpublic.h2
-rw-r--r--test/dtypes.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 8338fb2..02568c9 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -180,7 +180,7 @@ typedef enum H5F_libver_t {
H5F_LIBVER_V18 = 1, /* Use the latest v18 format for storing objects */
H5F_LIBVER_V110 = 2, /* Use the latest v110 format for storing objects */
H5F_LIBVER_V112 = 3, /* Use the latest v112 format for storing objects */
- H5F_LIBVER_V114 = 4, /* Use the latest v112 format for storing objects */
+ H5F_LIBVER_V114 = 4, /* Use the latest v114 format for storing objects */
H5F_LIBVER_NBOUNDS
} H5F_libver_t;
diff --git a/test/dtypes.c b/test/dtypes.c
index 5eaa77c..4ccb951 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -7650,8 +7650,8 @@ test_versionbounds(void)
hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */
int i, j; /* Indices for iterating over versions */
H5F_libver_t low, high; /* File format bounds */
- H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110};
- int versions_count = 3; /* Number of version bounds in the array */
+ H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, H5F_LIBVER_V114};
+ int versions_count = 5; /* Number of version bounds in the array */
unsigned highest_version; /* Highest version in nested datatypes */
color_t enum_val; /* Enum type index */
herr_t ret = 0; /* Generic return value */