summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2022-12-21 18:07:25 (GMT)
committerGitHub <noreply@github.com>2022-12-21 18:07:25 (GMT)
commit9f5cf0a45748fcb7ced4f4619d7c6c76cb3f67ab (patch)
tree2f237d0865fa37db7ad56d7182978db4258488fa /src
parent976e8c97504cfbce40c565b02a01d29006350c6b (diff)
downloadhdf5-9f5cf0a45748fcb7ced4f4619d7c6c76cb3f67ab.zip
hdf5-9f5cf0a45748fcb7ced4f4619d7c6c76cb3f67ab.tar.gz
hdf5-9f5cf0a45748fcb7ced4f4619d7c6c76cb3f67ab.tar.bz2
H5F_LIBVER_LATEST changes for move to 1.15 (#2288)
* H5F_LIBVER_LATEST changes for move to 1.15 * Add new default api check * Format fixes * Fix default configure * fix lib version tests * Fix another version variable * Add 1.14 doc link
Diffstat (limited to 'src')
-rw-r--r--src/H5.c4
-rw-r--r--src/H5Aint.c1
-rw-r--r--src/H5Dlayout.c12
-rw-r--r--src/H5Fpublic.h3
-rw-r--r--src/H5Fsuper.c1
-rw-r--r--src/H5Ofill.c1
-rw-r--r--src/H5Ofsinfo.c1
-rw-r--r--src/H5Oint.c1
-rw-r--r--src/H5Opline.c1
-rw-r--r--src/H5S.c1
-rw-r--r--src/H5Shyper.c1
-rw-r--r--src/H5Spoint.c1
-rw-r--r--src/H5T.c1
-rw-r--r--src/H5public.h8
-rw-r--r--src/H5trace.c6
15 files changed, 30 insertions, 13 deletions
diff --git a/src/H5.c b/src/H5.c
index 89330fe..259e240 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -70,8 +70,8 @@ static int H5__mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *fla
/*****************************/
/* Library incompatible release versions, develop releases are incompatible by design */
-const unsigned VERS_RELEASE_EXCEPTIONS[] = {0, 1, 2, 3, 4};
-const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 5;
+const unsigned VERS_RELEASE_EXCEPTIONS[] = {0};
+const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 1;
/* statically initialize block for pthread_once call used in initializing */
/* the first global mutex */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index 8662b5f..0b504be 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -104,6 +104,7 @@ const unsigned H5O_attr_ver_bounds[] = {
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V18 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V110 */
H5O_ATTR_VERSION_3, /* H5F_LIBVER_V112 */
+ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V114 */
H5O_ATTR_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c
index 8a10a37..26bdc55 100644
--- a/src/H5Dlayout.c
+++ b/src/H5Dlayout.c
@@ -42,11 +42,13 @@
/* Format version bounds for layout */
const unsigned H5O_layout_ver_bounds[] = {
- H5O_LAYOUT_VERSION_1, /* H5F_LIBVER_EARLIEST */
- H5O_LAYOUT_VERSION_3, /* H5F_LIBVER_V18 */ /* H5O_LAYOUT_VERSION_DEFAULT */
- H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V110 */
- H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */
- H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */
+ H5O_LAYOUT_VERSION_1, /* H5F_LIBVER_EARLIEST */
+ H5O_LAYOUT_VERSION_3,
+ /* H5F_LIBVER_V18 */ /* H5O_LAYOUT_VERSION_DEFAULT */
+ H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V110 */
+ H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */
+ H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V114 */
+ H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
/*****************************/
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 7d2a5da..9bee5c4 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -189,10 +189,11 @@ typedef enum H5F_libver_t {
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 v114 format for storing objects */
+ H5F_LIBVER_V116 = 5, /**< Use the latest v116 format for storing objects */
H5F_LIBVER_NBOUNDS /**< Sentinel */
} H5F_libver_t;
-#define H5F_LIBVER_LATEST H5F_LIBVER_V114
+#define H5F_LIBVER_LATEST H5F_LIBVER_V116
/**
* File space handling strategy
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index cf18fb0..d590119 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -70,6 +70,7 @@ static const unsigned HDF5_superblock_ver_bounds[] = {
HDF5_SUPERBLOCK_VERSION_2, /* H5F_LIBVER_V18 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V110 */
HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V112 */
+ HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V114 */
HDF5_SUPERBLOCK_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 094edaca..45877d2 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -155,6 +155,7 @@ const unsigned H5O_fill_ver_bounds[] = {
H5O_FILL_VERSION_3, /* H5F_LIBVER_V18 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V110 */
H5O_FILL_VERSION_3, /* H5F_LIBVER_V112 */
+ H5O_FILL_VERSION_3, /* H5F_LIBVER_V114 */
H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index 4d5934d..b376606 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -69,6 +69,7 @@ static const unsigned H5O_fsinfo_ver_bounds[] = {
H5O_INVALID_VERSION, /* H5F_LIBVER_V18 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V110 */
H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V112 */
+ H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V114 */
H5O_FSINFO_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
#define N_FSINFO_VERSION_BOUNDS H5F_LIBVER_NBOUNDS
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 0499cd9..cdcf6c8 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -125,6 +125,7 @@ const unsigned H5O_obj_ver_bounds[] = {
H5O_VERSION_2, /* H5F_LIBVER_V18 */
H5O_VERSION_2, /* H5F_LIBVER_V110 */
H5O_VERSION_2, /* H5F_LIBVER_V112 */
+ H5O_VERSION_2, /* H5F_LIBVER_V114 */
H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 58c729f..4ccd96c 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -91,6 +91,7 @@ const unsigned H5O_pline_ver_bounds[] = {
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V18 */
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V110 */
H5O_PLINE_VERSION_2, /* H5F_LIBVER_V112 */
+ H5O_PLINE_VERSION_2, /* H5F_LIBVER_V114 */
H5O_PLINE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5S.c b/src/H5S.c
index 84f2f82..bb5028d 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -60,6 +60,7 @@ const unsigned H5O_sdspace_ver_bounds[] = {
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V18 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V110 */
H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V112 */
+ H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V114 */
H5O_SDSPACE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 84cef80..2399937 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -243,6 +243,7 @@ const unsigned H5O_sds_hyper_ver_bounds[] = {
H5S_HYPER_VERSION_1, /* H5F_LIBVER_V18 */
H5S_HYPER_VERSION_2, /* H5F_LIBVER_V110 */
H5S_HYPER_VERSION_3, /* H5F_LIBVER_V112 */
+ H5S_HYPER_VERSION_3, /* H5F_LIBVER_V114 */
H5S_HYPER_VERSION_3 /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 8844181..b10b7da 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -128,6 +128,7 @@ const unsigned H5O_sds_point_ver_bounds[] = {
H5S_POINT_VERSION_1, /* H5F_LIBVER_V18 */
H5S_POINT_VERSION_1, /* H5F_LIBVER_V110 */
H5S_POINT_VERSION_2, /* H5F_LIBVER_V112 */
+ H5S_POINT_VERSION_2, /* H5F_LIBVER_V114 */
H5S_POINT_VERSION_2 /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5T.c b/src/H5T.c
index 7e85227..277fb06 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -551,6 +551,7 @@ const unsigned H5O_dtype_ver_bounds[] = {
H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V18 */
H5O_DTYPE_VERSION_3, /* H5F_LIBVER_V110 */
H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V112 */
+ H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V114 */
H5O_DTYPE_VERSION_LATEST /* H5F_LIBVER_LATEST */
};
diff --git a/src/H5public.h b/src/H5public.h
index 345191c..5ed54d9 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -79,19 +79,19 @@
/**
* For minor interface/format changes
*/
-#define H5_VERS_MINOR 13
+#define H5_VERS_MINOR 15
/**
* For tweaks, bug-fixes, or development
*/
-#define H5_VERS_RELEASE 4
+#define H5_VERS_RELEASE 0
/**
* For pre-releases like \c snap0. Empty string for official releases.
*/
-#define H5_VERS_SUBRELEASE "1"
+#define H5_VERS_SUBRELEASE ""
/**
* Full version string
*/
-#define H5_VERS_INFO "HDF5 library version: 1.13.4-1"
+#define H5_VERS_INFO "HDF5 library version: 1.15.0"
#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)
diff --git a/src/H5trace.c b/src/H5trace.c
index 03eaf11..3be5b91 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -1441,7 +1441,11 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap)
break;
case H5F_LIBVER_V114:
- HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V114);
+ H5RS_acat(rs, "H5F_LIBVER_V114");
+ break;
+
+ case H5F_LIBVER_V116:
+ HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V116);
H5RS_acat(rs, "H5F_LIBVER_LATEST");
break;