Merge pull request #811 in HDFFV/hdf5 from hdf5_1_8_20 to 1.8/masterhdf5-1_8_20

* commit '60f76980aab92f0e0730170b99a2363acd3c97fa': (108 commits)
  Update version numbers and remove empty sections in RELEASE.txt.
  Restore line 1154: C2Cppfunction_map.mht to HTML_EXTRA_FILES.
  Update version for 1.8.20 release.
  Fixed documentation warnings
  HDFFV-10329 Correct LINK INTERFACE and VS20013 compile
  Switch default build mode from development to production. Increment version string to pre2.
  Add RELEASE.txt note for HDFFV-10274. (cherry picked from commit f7a7d0a00613cba997212fa8032091629a678797)
  Initialize hid_t variables in test_Attr_bug9. (cherry picked from commit 97bc393449f3fe02c5992872ab2842e12f611ef0)
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case. (cherry picked from commit 1b2c2ca9a6a7d7e1fcd5c3302e203f2e2dabf0af)
  Fix linking of libs
  Changed file path to relative.
  iAdd NAG to supported compilers in RELEASE.txt.
  Add description to RELEASE.txt for HDFFV-10323
  Correct issue number
  Set version to 1.8.20-pre1
  Update supported and tested platforms in RELEASE.txt.
  HDFFV-10321 Merge from 1.8
  Incremented lib file .so numbers: revision for all except c++ for code change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  updated issues related to Fortran
  Incremented lib file .so numbers: revision for all except c++ for dcode change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  ...

1 files changed, 60 insertions, 84 deletions

diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 09134ed..ce2d061 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -22,24 +22,21 @@
 #else
 #include <iostream>
 #endif
-#include <string>
-
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cerr;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
 #include "h5cpputil.h"  // C++ utilility header file
 
 /* Number of elements in each test */
-#define NTESTELEM       100000
+#define NTESTELEM 100000
 
 typedef struct complex_t {
-    double                  re;
-    double                  im;
+    double re;
+    double im;
 } complex_t;
 
 
@@ -53,8 +50,6 @@ typedef struct complex_t {
  * Programmer:  Binh-Minh Ribler (using C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_1()
@@ -90,8 +85,6 @@ static void test_compound_1()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_2()
@@ -103,11 +96,11 @@ static void test_compound_2()
         int e, d, c[4], b, a;
     } dst_typ_t;
 
-    src_typ_t     *s_ptr;
-    dst_typ_t     *d_ptr;
-    const int      nelmts = NTESTELEM;
-    const hsize_t  four = 4;
-    int            i;
+    src_typ_t *s_ptr;
+    dst_typ_t *d_ptr;
+    const int nelmts = NTESTELEM;
+    const hsize_t four = 4;
+    int i;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
     ArrayType *array_dt = NULL;
 
@@ -115,9 +108,9 @@ static void test_compound_2()
     SUBTEST("Compound Element Reordering");
     try {
         // Sizes should be the same, but be careful just in case
-        buf = (unsigned char*)malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-        bkg = (unsigned char*)malloc(nelmts * sizeof(dst_typ_t));
-        orig = (unsigned char*)malloc(nelmts * sizeof(src_typ_t));
+        buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
+        bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
+        orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
         for (i=0; i<nelmts; i++) {
             s_ptr = ((src_typ_t*)orig) + i;
             s_ptr->a    = i*8+0;
@@ -183,9 +176,9 @@ static void test_compound_2()
             }
         }
         // Release resources
-        free(buf);
-        free(bkg);
-        free(orig);
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
         s_ptr = NULL;
         d_ptr = NULL;
         st.close();
@@ -215,8 +208,6 @@ static void test_compound_2()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_3()
@@ -228,11 +219,11 @@ static void test_compound_3()
         int a,    c[4],    e;
     } dst_typ_t;
 
-    src_typ_t     *s_ptr;
-    dst_typ_t     *d_ptr;
-    int            i;
-    const int      nelmts = NTESTELEM;
-    const hsize_t  four = 4;
+    src_typ_t *s_ptr;
+    dst_typ_t *d_ptr;
+    int i;
+    const int nelmts = NTESTELEM;
+    const hsize_t four = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
     ArrayType* array_dt = NULL;
 
@@ -240,9 +231,9 @@ static void test_compound_3()
     SUBTEST("Compound Datatype Subset Conversions");
     try {
         /* Initialize */
-        buf = (unsigned char*)malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-        bkg = (unsigned char*)malloc(nelmts * sizeof(dst_typ_t));
-        orig = (unsigned char*)malloc(nelmts * sizeof(src_typ_t));
+        buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
+        bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
+        orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
         for (i=0; i<nelmts; i++) {
             s_ptr = ((src_typ_t*)orig) + i;
             s_ptr->a    = i*8+0;
@@ -305,9 +296,9 @@ static void test_compound_3()
         } // for
 
         /* Release resources */
-        free(buf);
-        free(bkg);
-        free(orig);
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
         s_ptr = NULL;
         d_ptr = NULL;
         st.close();
@@ -337,8 +328,6 @@ static void test_compound_3()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_4()
@@ -355,11 +344,11 @@ static void test_compound_4()
         int e;
     } dst_typ_t;
 
-    src_typ_t     *s_ptr;
-    dst_typ_t     *d_ptr;
-    int            i;
-    const int      nelmts = NTESTELEM;
-    const hsize_t  four = 4;
+    src_typ_t *s_ptr;
+    dst_typ_t *d_ptr;
+    int i;
+    const int nelmts = NTESTELEM;
+    const hsize_t four = 4;
     unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
     ArrayType* array_dt = NULL;
 
@@ -367,9 +356,9 @@ static void test_compound_4()
     SUBTEST("Compound Element Shrinking & Reordering");
     try {
         /* Sizes should be the same, but be careful just in case */
-        buf = (unsigned char*)malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-        bkg = (unsigned char*)malloc(nelmts * sizeof(dst_typ_t));
-        orig = (unsigned char*)malloc(nelmts * sizeof(src_typ_t));
+        buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
+        bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
+        orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
         for (i=0; i<nelmts; i++) {
             s_ptr = ((src_typ_t*)orig) + i;
             s_ptr->a    = i*8+0;
@@ -378,7 +367,7 @@ static void test_compound_4()
             s_ptr->c[1] = i*8+3;
             s_ptr->c[2] = i*8+4;
             s_ptr->c[3] = i*8+5;
-            s_ptr->d        = (i*8+6) & 0x7fff;
+            s_ptr->d    = (i*8+6) & 0x7fff;
             s_ptr->e    = i*8+7;
         }
         memcpy(buf, orig, nelmts*sizeof(src_typ_t));
@@ -437,9 +426,9 @@ static void test_compound_4()
         } // for
 
         /* Release resources */
-        free(buf);
-        free(bkg);
-        free(orig);
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
         s_ptr = NULL;
         d_ptr = NULL;
         st.close();
@@ -470,8 +459,6 @@ static void test_compound_4()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_5()
@@ -488,12 +475,12 @@ static void test_compound_5()
         int     coll_ids[4];
     } dst_typ_t;
 
-    hsize_t      dims[1] = {4};
-    src_typ_t  src[2] = {{"one", 102, {104, 105, 106, 107}},
-                          {"two", 202, {204, 205, 206, 207}}};
-    dst_typ_t  *dst;
-    void        *buf = calloc(2, sizeof(dst_typ_t));
-    void        *bkg = calloc(2, sizeof(dst_typ_t));
+    hsize_t dims[1] = {4};
+    src_typ_t src[2] = {{"one", 102, {104, 105, 106, 107}},
+                        {"two", 202, {204, 205, 206, 207}}};
+    dst_typ_t *dst;
+    void *buf = HDcalloc(2, sizeof(dst_typ_t));
+    void *bkg = HDcalloc(2, sizeof(dst_typ_t));
     ArrayType* array_dt = NULL;
 
     // Output message about test being performed
@@ -545,8 +532,8 @@ static void test_compound_5()
         { H5_FAILED(); }
 
         /* Free memory buffers */
-        free(buf);
-        free(bkg);
+        HDfree(buf);
+        HDfree(bkg);
         dst = NULL;
         PASSED();
     }   // end of try block
@@ -573,8 +560,6 @@ static void test_compound_5()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_6()
@@ -589,23 +574,23 @@ static void test_compound_6()
         long d;
     } dst_typ_t;
 
-    src_typ_t     *s_ptr;
-    dst_typ_t     *d_ptr;
-    int            i;
-    const int      nelmts = NTESTELEM;
+    src_typ_t *s_ptr;
+    dst_typ_t *d_ptr;
+    int i;
+    const int nelmts = NTESTELEM;
     unsigned char *buf=NULL, *orig=NULL, *bkg=NULL;
 
     // Output message about test being performed
     SUBTEST("Compound Element Growing");
     try {
         /* Sizes should be the same, but be careful just in case */
-        buf = (unsigned char*)malloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
-        bkg = (unsigned char*)malloc(nelmts * sizeof(dst_typ_t));
-        orig = (unsigned char*)malloc(nelmts * sizeof(src_typ_t));
+        buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(src_typ_t), sizeof(dst_typ_t)));
+        bkg = (unsigned char*)HDmalloc(nelmts * sizeof(dst_typ_t));
+        orig = (unsigned char*)HDmalloc(nelmts * sizeof(src_typ_t));
         for (i=0; i<nelmts; i++) {
             s_ptr = ((src_typ_t*)orig) + i;
-            s_ptr->b    = (i*8+1) & 0x7fff;
-            s_ptr->d    = (i*8+6) & 0x7fff;
+            s_ptr->b = (i*8+1) & 0x7fff;
+            s_ptr->d = (i*8+6) & 0x7fff;
         }
         memcpy(buf, orig, nelmts*sizeof(src_typ_t));
 
@@ -638,9 +623,9 @@ static void test_compound_6()
         } // for
 
         /* Release resources */
-        free(buf);
-        free(bkg);
-        free(orig);
+        HDfree(buf);
+        HDfree(bkg);
+        HDfree(orig);
         s_ptr = NULL;
         d_ptr = NULL;
         st.close();
@@ -665,8 +650,6 @@ static void test_compound_6()
  * Programmer:  Binh-Minh Ribler (use C version)
  *              January, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_compound_7()
@@ -731,8 +714,6 @@ static void test_compound_7()
  * Programmer:  Binh-Minh Ribler (use partial C version test_ooo_order)
  *              March, 2014
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 const H5std_string COMPFILE("tcompound_types.h5");
@@ -821,15 +802,12 @@ static void test_compound_set_size()
  * Programmer:  Binh-Minh Ribler
  *              January 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 extern "C"
 void test_compound()
 {
     // Output message about test being performed
-    //MESSAGE("Testing Compound Data Type operations\n");
     MESSAGE(5, ("Testing Compound Data Type operations\n"));
 
     test_compound_1();  // various things about compound data types
@@ -850,8 +828,6 @@ void test_compound()
  *
  * Return:      none
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 extern "C"