Merge pull request #1639 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/add_v112_version_bounds to develop

* commit '0073f198978dea0116bd74816b3119dfeb09144b':
  Set V112 as the latest format and extend the arrays of version bounds.

11 files changed, 17 insertions, 4 deletions

diff --git a/src/H5Aint.c b/src/H5Aint.c
index 88a4780..d8ba92a 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -108,6 +108,7 @@ static herr_t H5A__iterate_common(hid_t loc_id, H5_index_t idx_type,
 const unsigned H5O_attr_ver_bounds[] = {
     H5O_ATTR_VERSION_1,         /* H5F_LIBVER_EARLIEST */
     H5O_ATTR_VERSION_3,         /* H5F_LIBVER_V18 */
+    H5O_ATTR_VERSION_3,         /* H5F_LIBVER_V110 */
     H5O_ATTR_VERSION_LATEST     /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c
index 494d2c8..fb28489 100644
--- a/src/H5Dlayout.c
+++ b/src/H5Dlayout.c
@@ -50,6 +50,7 @@
 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_LATEST   /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 03bbbd9..5d03b3b 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -3327,7 +3327,7 @@ H5F__start_swmr_write(H5F_t *f)
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "file superblock version - should be at least 3")
 
     /* Check for correct file format version */
-    if((f->shared->low_bound != H5F_LIBVER_V110) || (f->shared->high_bound != H5F_LIBVER_V110))
+    if((f->shared->low_bound < H5F_LIBVER_V110) || (f->shared->high_bound < H5F_LIBVER_V110))
         HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "file format version does not support SWMR - needs to be 1.10 or greater")
 
     /* Should not be marked for SWMR writing mode already */
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 9f1ed01..8274654 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -178,11 +178,12 @@ typedef enum H5F_libver_t {
     H5F_LIBVER_ERROR = -1,
     H5F_LIBVER_EARLIEST = 0,    /* Use the earliest possible format for storing objects */
     H5F_LIBVER_V18 = 1,         /* Use the latest v18 format for storing objects */
-    H5F_LIBVER_V110 = 2,        /* Use the latest v10 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_NBOUNDS
 } H5F_libver_t;
 
-#define H5F_LIBVER_LATEST   H5F_LIBVER_V110
+#define H5F_LIBVER_LATEST   H5F_LIBVER_V112
 
 /* File space handling strategy */
 typedef enum H5F_fspace_strategy_t {
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 3c225a2..aa5a85d 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -76,6 +76,7 @@ H5FL_DEFINE(H5F_super_t);
 static const unsigned HDF5_superblock_ver_bounds[] = {
     HDF5_SUPERBLOCK_VERSION_DEF,    /* H5F_LIBVER_EARLIEST */
     HDF5_SUPERBLOCK_VERSION_2,      /* H5F_LIBVER_V18 */
+    HDF5_SUPERBLOCK_VERSION_3,      /* H5F_LIBVER_V110 */
     HDF5_SUPERBLOCK_VERSION_LATEST  /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index ebd885c..d87dc84 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -157,6 +157,7 @@ const H5O_msg_class_t H5O_MSG_FILL_NEW[1] = {{
 const unsigned H5O_fill_ver_bounds[] = {
     H5O_FILL_VERSION_1,     /* H5F_LIBVER_EARLIEST */
     H5O_FILL_VERSION_2,     /* H5F_LIBVER_V18 */
+    H5O_FILL_VERSION_3,     /* H5F_LIBVER_V110 */
     H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 570f94e..60aae45 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -130,6 +130,7 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = {
 const unsigned H5O_obj_ver_bounds[] = {
     H5O_VERSION_1,      /* H5F_LIBVER_EARLIEST */
     H5O_VERSION_2,      /* H5F_LIBVER_V18 */
+    H5O_VERSION_2,      /* H5F_LIBVER_V110 */
     H5O_VERSION_LATEST  /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 85a95b7..609f2eb 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -93,6 +93,7 @@ const H5O_msg_class_t H5O_MSG_PLINE[1] = {{
 const unsigned H5O_pline_ver_bounds[] = {
     H5O_PLINE_VERSION_1,        /* H5F_LIBVER_EARLIEST */
     H5O_PLINE_VERSION_2,        /* H5F_LIBVER_V18 */
+    H5O_PLINE_VERSION_2,        /* H5F_LIBVER_V110 */
     H5O_PLINE_VERSION_LATEST    /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5S.c b/src/H5S.c
index bf30a26..301060f 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -66,6 +66,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
 const unsigned H5O_sdspace_ver_bounds[] = {
     H5O_SDSPACE_VERSION_1,      /* H5F_LIBVER_EARLIEST */
     H5O_SDSPACE_VERSION_2,      /* H5F_LIBVER_V18 */
+    H5O_SDSPACE_VERSION_2,      /* H5F_LIBVER_V110 */
     H5O_SDSPACE_VERSION_LATEST  /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5T.c b/src/H5T.c
index 1c4acb9..8c8a9b7 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -513,6 +513,7 @@ H5FL_DEFINE(H5T_shared_t);
 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_LATEST    /* H5F_LIBVER_LATEST */
 };
 
diff --git a/src/H5trace.c b/src/H5trace.c
index 9a13193..23f2f1d 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -1054,7 +1054,11 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     break;
 
                                 case H5F_LIBVER_V110:
-                                    HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V110);
+                                    HDfprintf(out, "H5F_LIBVER_V110");
+                                    break;
+
+                                case H5F_LIBVER_V112:
+                                    HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V112);
                                     HDfprintf(out, "H5F_LIBVER_LATEST");
                                     break;