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

31 files changed, 127 insertions, 138 deletions

diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index 988a3b2..4302352 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5ArrayType_H
-#define __H5ArrayType_H
+#ifndef H5ArrayType_H
+#define H5ArrayType_H
 
 namespace H5 {
 
@@ -21,20 +21,20 @@ namespace H5 {
     \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
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index b157cbf..84da5e9 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 2e411ef..aca7f45 100644
--- a/c++/src/H5Attribute.cpp
+++ b/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
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index 900b7f7..87ee889 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index f2d7907..af35a66 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index b528aa4..751ebbe 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index b18165d..e06004f 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index fc64e33..4337a6f 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index 3c06179..6704130 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 5565d18..f16acfc 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index e5474e2..4c18137 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index e437aea..fd43193 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#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
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index fbe28b8..11bad65 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5DSetMemXferPropList_H
-#define __H5DSetMemXferPropList_H
+#ifndef H5DSetMemXferPropList_H
+#define H5DSetMemXferPropList_H
 
 namespace H5 {
 
@@ -105,7 +105,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
         return ("DSetMemXferPropList");
     }
 
-    // Copy constructor: makes a copy of a DSetMemXferPropList object.
+    // Copy constructor - same as the original DSetMemXferPropList.
     DSetMemXferPropList(const DSetMemXferPropList &orig);
 
     // Creates a copy of an existing dataset memory and transfer
@@ -131,4 +131,4 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
 }; // end of DSetMemXferPropList
 } // namespace H5
 
-#endif // __H5DSetMemXferPropList_H
+#endif // H5DSetMemXferPropList_H
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index a7fe3ff..484405a 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5EnumType_H
-#define __H5EnumType_H
+#ifndef H5EnumType_H
+#define H5EnumType_H
 
 namespace H5 {
 
@@ -23,6 +23,7 @@ namespace H5 {
 */
 //  Inheritance: DataType -> H5Object -> H5Location -> IdComponent
 class H5_DLLCPP EnumType : public DataType {
+
   public:
     // Creates an empty enumeration datatype based on a native signed
     // integer type, whose size is given by size.
@@ -78,7 +79,7 @@ class H5_DLLCPP EnumType : public DataType {
     // Creates an enumeration datatype using an existing id
     EnumType(const hid_t existing_id);
 
-    // Copy constructor: makes a copy of the original EnumType object.
+    // Copy constructor: same as the original EnumType.
     EnumType(const EnumType &original);
 
     virtual ~EnumType();
@@ -86,4 +87,4 @@ class H5_DLLCPP EnumType : public DataType {
 }; // end of EnumType
 } // namespace H5
 
-#endif // __H5EnumType_H
+#endif // H5EnumType_H
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index 0e1fb5e..5586d84 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -12,13 +12,12 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Exception_H
-#define __H5Exception_H
+#ifndef H5Exception_H
+#define H5Exception_H
 
 #include <string>
 
 namespace H5 {
-
 #ifdef H5_NO_STD
 #define H5std_string ::string
 #else
@@ -169,4 +168,4 @@ class H5_DLLCPP IdComponentException : public Exception {
 }; // end of IdComponentException
 } // namespace H5
 
-#endif // __H5Exception_H
+#endif // H5Exception_H
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 49cea36..b1990cc 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FileAccPropList_H
-#define __H5FileAccPropList_H
+#ifndef H5FileAccPropList_H
+#define H5FileAccPropList_H
 
 namespace H5 {
 
@@ -130,7 +130,7 @@ class H5_DLLCPP FileAccPropList : public PropList {
         return ("FileAccPropList");
     }
 
-    // Copy constructor: creates a copy of a FileAccPropList object.
+    // Copy constructor: same as the original FileAccPropList.
     FileAccPropList(const FileAccPropList &original);
 
     // Creates a copy of an existing file access property list
@@ -156,4 +156,4 @@ class H5_DLLCPP FileAccPropList : public PropList {
 }; // end of FileAccPropList
 } // namespace H5
 
-#endif // __H5FileAccPropList_H
+#endif // H5FileAccPropList_H
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 66cdc95..61f033d 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FileCreatPropList_H
-#define __H5FileCreatPropList_H
+#ifndef H5FileCreatPropList_H
+#define H5FileCreatPropList_H
 
 namespace H5 {
 
@@ -67,7 +67,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
         return ("FileCreatPropList");
     }
 
-    // Copy constructor: creates a copy of a FileCreatPropList object.
+    // Copy constructor: same as the original FileCreatPropList.
     FileCreatPropList(const FileCreatPropList &orig);
 
     // Creates a copy of an existing file create property list
@@ -93,4 +93,4 @@ class H5_DLLCPP FileCreatPropList : public PropList {
 }; // end of FileCreatPropList
 } // namespace H5
 
-#endif // __H5FileCreatPropList_H
+#endif // H5FileCreatPropList_H
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 2c68b60..745ed9f 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5File_H
-#define __H5File_H
+#ifndef H5File_H
+#define H5File_H
 
 namespace H5 {
 
@@ -46,10 +46,10 @@ class H5_DLLCPP H5File : public Group {
     // Close this file.
     virtual void close();
 
-    // Gets the access property list of this file.
+    // Gets a copy of the access property list of this file.
     FileAccPropList getAccessPlist() const;
 
-    // Gets the creation property list of this file.
+    // Gets a copy of the creation property list of this file.
     FileCreatPropList getCreatePlist() const;
 
     // Gets general information about this file.
@@ -106,7 +106,7 @@ class H5_DLLCPP H5File : public Group {
     // Default constructor
     H5File();
 
-    // Copy constructor: makes a copy of the original H5File object.
+    // Copy constructor: same as the original H5File.
     H5File(const H5File &original);
 
     // Gets the HDF5 file id.
@@ -132,4 +132,4 @@ class H5_DLLCPP H5File : public Group {
 }; // end of H5File
 } // namespace H5
 
-#endif // __H5File_H
+#endif // H5File_H
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index 7f2f868..c76be95 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5FloatType_H
-#define __H5FloatType_H
+#ifndef H5FloatType_H
+#define H5FloatType_H
 
 namespace H5 {
 
@@ -75,7 +75,7 @@ class H5_DLLCPP FloatType : public AtomType {
     // Creates a floating-point datatype using an existing id.
     FloatType(const hid_t existing_id);
 
-    // Copy constructor: makes a copy of the original FloatType object.
+    // Copy constructor: same as the original FloatType.
     FloatType(const FloatType &original);
 
     // Noop destructor.
@@ -84,4 +84,4 @@ class H5_DLLCPP FloatType : public AtomType {
 }; // end of FloatType
 } // namespace H5
 
-#endif // __H5FloatType_H
+#endif // H5FloatType_H
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 8ee9eec..bbd460d 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Group_H
-#define __H5Group_H
+#ifndef __Group_H
+#define __Group_H
 
 namespace H5 {
 
@@ -47,7 +47,7 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
     // default constructor
     Group();
 
-    // Copy constructor: makes a copy of the original object
+    // Copy constructor: same as the original Group.
     Group(const Group &original);
 
     // Gets the group id.
@@ -80,4 +80,4 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 }; // end of Group
 } // namespace H5
 
-#endif // __H5Group_H
+#endif // __Group_H
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 005d11f..0077592 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5IntType_H
-#define __H5IntType_H
+#ifndef H5IntType_H
+#define H5IntType_H
 
 namespace H5 {
 
@@ -59,7 +59,7 @@ class H5_DLLCPP IntType : public AtomType {
     // Creates a integer datatype using an existing id
     IntType(const hid_t existing_id);
 
-    // Copy constructor: makes copy of IntType object
+    // Copy constructor: same as the original IntType.
     IntType(const IntType &original);
 
     // Noop destructor.
@@ -68,4 +68,4 @@ class H5_DLLCPP IntType : public AtomType {
 }; // end of IntType
 } // namespace H5
 
-#endif // __H5IntType_H
+#endif // H5IntType_H
diff --git a/c++/src/H5LaccProp.h b/c++/src/H5LaccProp.h
index 77b7b1e..71f5383 100644
--- a/c++/src/H5LaccProp.h
+++ b/c++/src/H5LaccProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5LinkAccPropList_H
-#define __H5LinkAccPropList_H
+#ifndef H5LinkAccPropList_H
+#define H5LinkAccPropList_H
 
 namespace H5 {
 
@@ -38,7 +38,7 @@ class H5_DLLCPP LinkAccPropList : public PropList {
         return ("LinkAccPropList");
     }
 
-    // Copy constructor: creates a copy of a LinkAccPropList object.
+    // Copy constructor: same as the original LinkAccPropList.
     LinkAccPropList(const LinkAccPropList &original);
 
     // Creates a copy of an existing link access property list
@@ -71,4 +71,4 @@ class H5_DLLCPP LinkAccPropList : public PropList {
 }; // end of LinkAccPropList
 } // namespace H5
 
-#endif // __H5LinkAccPropList_H
+#endif // H5LinkAccPropList_H
diff --git a/c++/src/H5LcreatProp.h b/c++/src/H5LcreatProp.h
index a5affd1..7a1ea98 100644
--- a/c++/src/H5LcreatProp.h
+++ b/c++/src/H5LcreatProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5LinkCreatPropList_H
-#define __H5LinkCreatPropList_H
+#ifndef H5LinkCreatPropList_H
+#define H5LinkCreatPropList_H
 
 namespace H5 {
 
@@ -59,8 +59,8 @@ class H5_DLLCPP LinkCreatPropList : public StrCreatPropList {
     static LinkCreatPropList *getConstant();
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
-};     // end of LinkCreatPropList
 
+}; // end of LinkCreatPropList
 } // namespace H5
 
-#endif // __H5LinkCreatPropList_H
+#endif // H5LinkCreatPropList_H
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index 6037539..3df8d56 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Library_H
-#define __H5Library_H
+#ifndef H5Library_H
+#define H5Library_H
 
 namespace H5 {
 
@@ -57,6 +57,7 @@ class H5_DLLCPP H5Library {
     static void termH5cpp(void);
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
+
   private:
     // Default constructor - no instance ever created from outsiders
     H5Library();
@@ -68,4 +69,4 @@ class H5_DLLCPP H5Library {
 }; // end of H5Library
 } // namespace H5
 
-#endif // __H5Library_H
+#endif // H5Library_H
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index e0acf8e..10f5a3c 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Location_H
-#define __H5Location_H
+#ifndef H5Location_H
+#define H5Location_H
 
 #include "H5Classes.h" // constains forward class declarations
 
@@ -276,14 +276,4 @@ class H5_DLLCPP H5Location : public IdComponent {
 }; // end of H5Location
 } // namespace H5
 
-#endif // __H5Location_H
-
-// Modification
-//      Oct 1, 2013 -BMR
-//          H5Location is added in version 1.8.12.
-//          Most of these methods were in H5Object but are now moved here
-//          because a location can be a file, group, dataset, or named datatype.
-//      May 04, 2017 -BMR
-//          Wrappers for H5A functions are copied to H5Object because H5A
-//          functions do not take an attribute id as loc_id.  The original
-//          wrappers will be deprecated in future releases.
+#endif // H5Location_H
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index a52eda9..04798bd 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5Object_H
-#define __H5Object_H
+#ifndef H5Object_H
+#define H5Object_H
 
 namespace H5 {
 
@@ -97,4 +97,4 @@ class H5_DLLCPP H5Object : public H5Location {
 }; // end of H5Object
 } // namespace H5
 
-#endif // __H5Object_H
+#endif // H5Object_H
diff --git a/c++/src/H5OcreatProp.h b/c++/src/H5OcreatProp.h
index a15ea56..02a6284 100644
--- a/c++/src/H5OcreatProp.h
+++ b/c++/src/H5OcreatProp.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5ObjCreatPropList_H
-#define __H5ObjCreatPropList_H
+#ifndef H5ObjCreatPropList_H
+#define H5ObjCreatPropList_H
 
 namespace H5 {
 
@@ -49,7 +49,7 @@ class H5_DLLCPP ObjCreatPropList : public PropList {
         return ("ObjCreatPropList");
     }
 
-    // Copy constructor: creates a copy of a ObjCreatPropList object.
+    // Copy constructor: same as the original ObjCreatPropList.
     ObjCreatPropList(const ObjCreatPropList &original);
 
     // Creates a copy of an existing object creation property list
@@ -75,4 +75,4 @@ class H5_DLLCPP ObjCreatPropList : public PropList {
 }; // end of ObjCreatPropList
 } // namespace H5
 
-#endif // __H5ObjCreatPropList_H
+#endif // H5ObjCreatPropList_H
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index c9e3f12..b40d2b3 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5PredType_H
-#define __H5PredType_H
+#ifndef H5PredType_H
+#define H5PredType_H
 
 namespace H5 {
 
@@ -38,7 +38,7 @@ class H5_DLLCPP PredType : public AtomType {
     // id in the left hand side object.
     PredType &operator=(const PredType &rhs);
 
-    // Copy constructor - makes copy of the original object
+    // Copy constructor: same as the original PredType.
     PredType(const PredType &original);
 
     // Noop destructor
@@ -435,11 +435,11 @@ class H5_DLLCPP PredType : public AtomType {
 #if H5_SIZEOF_UINT_FAST64_T != 0
     static PredType *NATIVE_UINT_FAST64_;
 #endif /* H5_SIZEOF_UINT_FAST64_T */
-       // End of Declaration of pointers
+    // End of Declaration of pointers
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 }; // end of PredType
 } // namespace H5
 
-#endif // __H5PredType_H
+#endif // H5PredType_H
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index 2f08332..9d6c937 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5PropList_H
-#define __H5PropList_H
+#ifndef H5PropList_H
+#define H5PropList_H
 
 namespace H5 {
 
@@ -106,7 +106,7 @@ class H5_DLLCPP PropList : public IdComponent {
     // Default constructor: creates a stub PropList object.
     PropList();
 
-    // Copy constructor: creates a copy of a PropList object.
+    // Copy constructor: same as the original PropList.
     PropList(const PropList &original);
 
     // Gets the property list id.
@@ -140,4 +140,4 @@ class H5_DLLCPP PropList : public IdComponent {
 }; // end of PropList
 } // namespace H5
 
-#endif // __H5PropList_H
+#endif // H5PropList_H
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 659c17a..d272c53 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5StrType_H
-#define __H5StrType_H
+#ifndef H5StrType_H
+#define H5StrType_H
 
 namespace H5 {
 
@@ -69,7 +69,7 @@ class H5_DLLCPP StrType : public AtomType {
     // Creates a string datatype using an existing id
     StrType(const hid_t existing_id);
 
-    // Copy constructor - makes a copy of the original object
+    // Copy constructor: same as the original StrType.
     StrType(const StrType &original);
 
     // Noop destructor.
@@ -78,4 +78,4 @@ class H5_DLLCPP StrType : public AtomType {
 }; // end of StrType
 } // namespace H5
 
-#endif // __H5StrType_H
+#endif // H5StrType_H
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index dc75051..f5296ee 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -12,8 +12,8 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef __H5VarLenType_H
-#define __H5VarLenType_H
+#ifndef H5VarLenType_H
+#define H5VarLenType_H
 
 namespace H5 {
 
@@ -46,7 +46,7 @@ class H5_DLLCPP VarLenType : public DataType {
         return ("VarLenType");
     }
 
-    // Copy constructor: makes copy of the original object.
+    // Copy constructor: same as the original VarLenType.
     VarLenType(const VarLenType &original);
 
     // Constructor that takes an existing id
@@ -61,4 +61,4 @@ class H5_DLLCPP VarLenType : public DataType {
 }; // end of VarLenType
 } // namespace H5
 
-#endif // __H5VarLenType_H
+#endif // H5VarLenType_H