Merge remote-tracking branch 'origin/develop' into threading_updates

bin/release

@@ -455,7 +455,7 @@ cp -p Makefile.dist Makefile
 
 # Update README.md and release_docs/RELEASE.txt with release information in
 # line 1.
-for f in README.md release_docs/RELEASE.txt; do
+for f in README.md release_docs/RELEASE.txt release_docs/NEWSLETTER.txt; do
     echo "HDF5 version $VERS released on $release_date" >$f.x
     sed -e 1d $f >>$f.x
     mv $f.x $f

doxygen/examples/H5.format.html

@@ -1432,7 +1432,7 @@ <h3><a name="DriverInfo">
 
 	    <tr>
 	      <td><p>Address of Member File N</p></td>
-	      <td><p>This field Specifies the virtual address at which the member file starts.</p>
+	      <td><p>This field specifies the virtual address at which the member file starts.</p>
 	        <p>N is the number of member files.</p>
 	      </td>
 	    </tr>

release_docs/NEWSLETTER.txt

@@ -1,18 +1,9 @@
-Release of HDF5 1.14.4 Library and Tools is now available from the HDF5 Releases page.
+HDF5 version 1.15.0 currently under development
 
-This is a maintenance release with a few changes and updates:
+Features included for the next major release:
 ----------------------------------------------------------------------------
 
-* Added support for _Float16 16-bit floating-point datatype
-
-  Support for the 16-bit floating-point _Float16 C type has been added to
-  HDF5. On platforms where this type is available, this can enable more
-  efficient storage of floating-point data when an application doesn't
-  need the precision of larger floating-point datatypes. It can also allow
-  for improved performance when converting between 16-bit floating-point
-  data and data of another HDF5 datatype.
-
-  (GitHub #4065, #2154)
+*
 
 ----------------------------------------------------------------------------
 Please see the full release notes for detailed information regarding this release,

src/CMakeLists.txt

@@ -609,6 +609,15 @@ set (H5T_SOURCES
     ${HDF5_SRC_DIR}/H5Tcommit.c
     ${HDF5_SRC_DIR}/H5Tcompound.c
     ${HDF5_SRC_DIR}/H5Tconv.c
+    ${HDF5_SRC_DIR}/H5Tconv_integer.c
+    ${HDF5_SRC_DIR}/H5Tconv_float.c
+    ${HDF5_SRC_DIR}/H5Tconv_string.c
+    ${HDF5_SRC_DIR}/H5Tconv_bitfield.c
+    ${HDF5_SRC_DIR}/H5Tconv_compound.c
+    ${HDF5_SRC_DIR}/H5Tconv_reference.c
+    ${HDF5_SRC_DIR}/H5Tconv_enum.c
+    ${HDF5_SRC_DIR}/H5Tconv_vlen.c
+    ${HDF5_SRC_DIR}/H5Tconv_array.c
     ${HDF5_SRC_DIR}/H5Tcset.c
     ${HDF5_SRC_DIR}/H5Tdbg.c
     ${HDF5_SRC_DIR}/H5Tdeprec.c
@@ -968,6 +977,17 @@ set (H5_PRIVATE_HEADERS
     ${HDF5_SRC_DIR}/H5SMpkg.h
     ${HDF5_SRC_DIR}/H5SMprivate.h
 
+    ${HDF5_SRC_DIR}/H5Tconv.h
+    ${HDF5_SRC_DIR}/H5Tconv_array.h
+    ${HDF5_SRC_DIR}/H5Tconv_bitfield.h
+    ${HDF5_SRC_DIR}/H5Tconv_compound.h
+    ${HDF5_SRC_DIR}/H5Tconv_enum.h
+    ${HDF5_SRC_DIR}/H5Tconv_float.h
+    ${HDF5_SRC_DIR}/H5Tconv_integer.h
+    ${HDF5_SRC_DIR}/H5Tconv_macros.h
+    ${HDF5_SRC_DIR}/H5Tconv_reference.h
+    ${HDF5_SRC_DIR}/H5Tconv_string.h
+    ${HDF5_SRC_DIR}/H5Tconv_vlen.h
     ${HDF5_SRC_DIR}/H5Tpkg.h
     ${HDF5_SRC_DIR}/H5Tprivate.h
 

src/H5T.c

@@ -43,6 +43,17 @@
 #include "H5VLprivate.h" /* Virtual Object Layer                     */
 #include "H5VMprivate.h" /* Vectors and arrays                       */
 
+/* Datatype conversion functions */
+#include "H5Tconv_integer.h"
+#include "H5Tconv_float.h"
+#include "H5Tconv_string.h"
+#include "H5Tconv_bitfield.h"
+#include "H5Tconv_compound.h"
+#include "H5Tconv_reference.h"
+#include "H5Tconv_enum.h"
+#include "H5Tconv_vlen.h"
+#include "H5Tconv_array.h"
+
 /****************/
 /* Local Macros */
 /****************/
@@ -4471,30 +4482,6 @@ H5T_get_size(const H5T_t *dt)
     FUNC_LEAVE_NOAPI(dt->shared->size)
 } /* end H5T_get_size() */
 
-/*-------------------------------------------------------------------------
- * Function:  H5T_get_force_conv
- *
- * Purpose:   Determines if the type has forced conversion. This will be
- *            true if and only if the type keeps a pointer to a file VOL
- *            object internally.
- *
- * Return:    true/false (never fails)
- *
- *-------------------------------------------------------------------------
- */
-bool
-H5T_get_force_conv(const H5T_t *dt)
-{
-    /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* check args */
-    assert(dt);
-    assert(dt->shared);
-
-    FUNC_LEAVE_NOAPI(dt->shared->force_conv)
-} /* end H5T_get_force_conv() */
-
 /*-------------------------------------------------------------------------
  * Function:  H5T_cmp
  *
@@ -5516,7 +5503,7 @@ H5T__path_free(H5T_path_t *path, H5T_conv_ctx_t *conv_ctx)
     assert(conv_ctx);
 
     if (path->conv.u.app_func) {
-        H5T__print_stats(path, &nprint);
+        H5T__print_path_stats(path, &nprint);
 
         path->cdata.command = H5T_CONV_FREE;