1 8 Merges from develop (#418)

* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

.github/CODEOWNERS

@@ -13,7 +13,7 @@ CMakeTests.*      @byrnHDF @derobins
 
 /bin/             @lrknox @derobins
 
-/c++/             @bmribler @byrnHDF
+/c++/             @bmribler @byrnHDF @derobins
 
 /config/          @lrknox @derobins @byrnHDF
 
@@ -23,7 +23,7 @@ CMakeTests.*      @byrnHDF @derobins
 
 /fortran/         @brtnfld @epourmal
 
-/hl/              @bmribler @byrnHDF
+/hl/              @bmribler @byrnHDF @derobins
 
 /m4/              @lrknox @derobins
 
@@ -35,6 +35,6 @@ CMakeTests.*      @byrnHDF @derobins
 
 /testpar/         @jhendersonHDF @rawarren @jrmainzer
 
-/tools/           @byrnHDF @bmribler
+/tools/           @byrnHDF @bmribler @derobins
 
-/utils/           @lrknox @byrnHDF
+/utils/           @lrknox @byrnHDF @derobins

bin/make_err

@@ -63,8 +63,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################

bin/make_overflow

@@ -92,8 +92,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################

bin/make_vers

@@ -70,8 +70,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################

c++/src/H5ArrayType.h

@@ -12,29 +12,29 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5ArrayType_H
-#define __H5ArrayType_H
+#ifndef H5ArrayType_H
+#define H5ArrayType_H
 
 namespace H5 {
 
 /*! \class ArrayType
     \brief Class ArrayType inherits from DataType and provides wrappers for
      the HDF5's Array Datatypes.
 */
-//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
+// Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP ArrayType : public DataType {
   public:
     // Constructor that creates a new array data type based on the
     // specified base type.
     ArrayType(const DataType &base_type, int ndims, const hsize_t *dims);
 
+    // Assignment operator
+    ArrayType &operator=(const ArrayType &rhs);
+
     // Constructors that open an array datatype, given a location.
     ArrayType(const H5Location &loc, const char *name);
     ArrayType(const H5Location &loc, const H5std_string &name);
 
-    // Assignment operator
-    ArrayType &operator=(const ArrayType &rhs);
-
     // Returns an ArrayType object via DataType* by decoding the
     // binary object description of this type.
     virtual DataType *decode() const;
@@ -54,7 +54,7 @@ class H5_DLLCPP ArrayType : public DataType {
         return ("ArrayType");
     }
 
-    // Copy constructor: makes copy of the original object.
+    // Copy constructor: same as the original ArrayType.
     ArrayType(const ArrayType &original);
 
     // Constructor that takes an existing id
@@ -69,4 +69,4 @@ class H5_DLLCPP ArrayType : public DataType {
 }; // end of ArrayType
 } // namespace H5
 
-#endif // __H5ArrayType_H
+#endif // H5ArrayType_H

c++/src/H5AtomType.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5AtomType_H
-#define __H5AtomType_H
+#ifndef H5AtomType_H
+#define H5AtomType_H
 
 namespace H5 {
 
@@ -24,7 +24,7 @@ namespace H5 {
     AtomType provides operations on HDF5 atomic datatypes.  It also inherits
     from DataType.
 */
-//  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
+// Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP AtomType : public DataType {
   public:
     // Returns the byte order of an atomic datatype.
@@ -64,7 +64,7 @@ class H5_DLLCPP AtomType : public DataType {
     }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-    // Copy constructor - makes copy of the original object
+    // Copy constructor: same as the original AtomType.
     AtomType(const AtomType &original);
 
     // Noop destructor
@@ -83,4 +83,4 @@ class H5_DLLCPP AtomType : public DataType {
 }; // end of AtomType
 } // namespace H5
 
-#endif // __H5AtomType_H
+#endif // H5AtomType_H

c++/src/H5Attribute.cpp

@@ -43,7 +43,7 @@ using std::cerr;
 using std::endl;
 #endif // H5_NO_STD
 
-// class H5_DLLCPP H5Object;  // forward declaration for UserData4Aiterate
+// class H5Object; // forward declaration for UserData4Aiterate
 
 //--------------------------------------------------------------------------
 // Function:    Attribute default constructor

c++/src/H5Attribute.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Attribute_H
-#define __H5Attribute_H
+#ifndef H5Attribute_H
+#define H5Attribute_H
 
 namespace H5 {
 
@@ -28,7 +28,7 @@ namespace H5 {
 //  Inheritance: multiple H5Location/AbstractDs
 class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
   public:
-    // Copy constructor: makes a copy of an existing Attribute object.
+    // Copy constructor: same as the original Attribute.
     Attribute(const Attribute &original);
 
     // Default constructor
@@ -124,4 +124,4 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
 }; // end of Attribute
 } // namespace H5
 
-#endif // __H5Attribute_H
+#endif // H5Attribute_H

c++/src/H5Classes.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Classes_H
-#define __H5Classes_H
+#ifndef H5Classes_H
+#define H5Classes_H
 
 namespace H5 {
 class Exception;
@@ -42,4 +42,4 @@ class H5File;
 class Attribute;
 class H5Library;
 } // namespace H5
-#endif // __H5Classes_H
+#endif // H5Classes_H

c++/src/H5CompType.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5CompType_H
-#define __H5CompType_H
+#ifndef H5CompType_H
+#define H5CompType_H
 
 namespace H5 {
 
@@ -40,7 +40,7 @@ class H5_DLLCPP CompType : public DataType {
     // Gets the compound datatype of the specified dataset
     CompType(const DataSet &dataset); // H5Dget_type
 
-    // Copy constructor - makes a copy of original object
+    // Copy constructor - same as the original CompType.
     CompType(const CompType &original);
 
     // Constructors that open a compound datatype, given a location.
@@ -128,4 +128,4 @@ class H5_DLLCPP CompType : public DataType {
 }; // end of CompType
 } // namespace H5
 
-#endif // __H5CompType_H
+#endif // H5CompType_H

c++/src/H5Cpp.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Cpp_H
-#define __H5Cpp_H
+#ifndef H5Cpp_H
+#define H5Cpp_H
 
 #include "H5Include.h"
 #include "H5Exception.h"
@@ -60,4 +60,4 @@
 #define HOFFSET(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
 #endif
 
-#endif // __H5Cpp_H
+#endif // H5Cpp_H

c++/src/H5CppDoc.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5CppDoc_H
-#define __H5CppDoc_H
+#ifndef H5CppDoc_H
+#define H5CppDoc_H
 
 //-------------------------------------------------------------------------
 // The following section will be used to generate the 'Mainpage'
@@ -53,10 +53,7 @@
  * <br />
  * \section install_sec Installation
  *
- * The HDF5 C++ API is included with the HDF5 source code and can
- * be obtained from
- * <a href="https://portal.hdfgroup.org/display/support/Downloads">
- *  * https://portal.hdfgroup.org/display/support/Downloads</a>.
+ * The HDF5 C++ API is included with the HDF5 source code.
  *
  * Please refer to the release_docs/INSTALL file under the top directory
  * of the HDF5 source code for information about installing, building,
@@ -95,4 +92,4 @@
 ///        This example shows how to work with groups.
 ///\example     h5group.cpp
 
-#endif // __H5CppDoc_H
+#endif // H5CppDoc_H

c++/src/H5DataSet.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataSet_H
-#define __H5DataSet_H
+#ifndef H5DataSet_H
+#define H5DataSet_H
 
 namespace H5 {
 
@@ -112,7 +112,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
     // Default constructor.
     DataSet();
 
-    // Copy constructor.
+    // Copy constructor - same as the original DataSet.
     DataSet(const DataSet &original);
 
     // Creates a copy of an existing DataSet using its id.
@@ -151,4 +151,4 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
 }; // end of DataSet
 } // namespace H5
 
-#endif // __H5DataSet_H
+#endif // H5DataSet_H

c++/src/H5DataSpace.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataSpace_H
-#define __H5DataSpace_H
+#ifndef H5DataSpace_H
+#define H5DataSpace_H
 
 namespace H5 {
 
@@ -36,7 +36,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
     // Creates a DataSpace object using an existing dataspace id.
     DataSpace(const hid_t space_id);
 
-    // Copy constructor: makes a copy of the original DataSpace object.
+    // Copy constructor - same as the original DataSpace.
     DataSpace(const DataSpace &original);
 
     // Assignment operator
@@ -155,4 +155,4 @@ class H5_DLLCPP DataSpace : public IdComponent {
 }; // end of DataSpace
 } // namespace H5
 
-#endif // __H5DataSpace_H
+#endif // H5DataSpace_H

c++/src/H5DataType.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DataType_H
-#define __H5DataType_H
+#ifndef H5DataType_H
+#define H5DataType_H
 
 namespace H5 {
 
@@ -30,13 +30,13 @@ class H5_DLLCPP DataType : public H5Object {
     // Creates a datatype given its class and size
     DataType(const H5T_class_t type_class, size_t size);
 
-    // Copy constructor: makes a copy of the original object
+    // Copy constructor - same as the original DataType.
     DataType(const DataType &original);
 
     // Creates a copy of a predefined type
     DataType(const PredType &pred_type);
 
-    // Opens a generic named datatype at a given location.
+    // Constructors to open a generic named datatype at a given location.
     DataType(const H5Location &loc, const char *name);
     DataType(const H5Location &loc, const H5std_string &name);
 
@@ -158,6 +158,7 @@ class H5_DLLCPP DataType : public H5Object {
 
     // Opens a datatype and returns the id.
     hid_t p_opentype(const H5Location &loc, const char *dtype_name) const;
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
   private:
@@ -176,4 +177,4 @@ class H5_DLLCPP DataType : public H5Object {
 }; // end of DataType
 } // namespace H5
 
-#endif // __H5DataType_H
+#endif // H5DataType_H

c++/src/H5DcreatProp.h

@@ -12,8 +12,8 @@
  * [email protected].                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DSCreatPropList_H
-#define __H5DSCreatPropList_H
+#ifndef H5DSCreatPropList_H
+#define H5DSCreatPropList_H
 
 namespace H5 {
 
@@ -126,7 +126,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
         return ("DSetCreatPropList");
     }
 
-    // Copy constructor: creates a copy of a DSetCreatPropList object.
+    // Copy constructor - same as the original DSetCreatPropList.
     DSetCreatPropList(const DSetCreatPropList &orig);
 
     // Creates a copy of an existing dataset creation property list
@@ -152,4 +152,4 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
 }; // end of DSetCreatPropList
 } // namespace H5
 
-#endif // __H5DSCreatPropList_H
+#endif // H5DSCreatPropList_H