From 94b55940ea800a861817a3b02575e5a180db62c8 Mon Sep 17 00:00:00 2001
From: Binh-Minh Ribler <bmribler@hdfgroup.org>
Date: Sun, 22 Sep 2013 23:04:26 -0500
Subject: [PATCH] [svn-r24189] Purpose: Fixed bug HDFFV-1060 Description:    
 Changed header guards from single underscore to double underscore. Platforms
 tested:     Linux/32 2.6 (jam) - very minor     Linux/64 2.6 (koala)/PGI
 compilers

---
 c++/src/H5AbstractDs.h  | 6 +++---
 c++/src/H5ArrayType.h   | 6 +++---
 c++/src/H5AtomType.h    | 6 +++---
 c++/src/H5Attribute.h   | 6 +++---
 c++/src/H5Classes.h     | 6 +++---
 c++/src/H5CommonFG.h    | 6 +++---
 c++/src/H5CompType.h    | 6 +++---
 c++/src/H5Cpp.h         | 6 +++---
 c++/src/H5CppDoc.h      | 6 +++---
 c++/src/H5DataSet.h     | 6 +++---
 c++/src/H5DataSpace.h   | 6 +++---
 c++/src/H5DataType.h    | 6 +++---
 c++/src/H5DcreatProp.h  | 6 +++---
 c++/src/H5DxferProp.h   | 6 +++---
 c++/src/H5EnumType.h    | 6 +++---
 c++/src/H5Exception.h   | 6 +++---
 c++/src/H5FaccProp.h    | 6 +++---
 c++/src/H5FcreatProp.h  | 6 +++---
 c++/src/H5File.h        | 6 +++---
 c++/src/H5FloatType.h   | 6 +++---
 c++/src/H5Group.h       | 6 +++---
 c++/src/H5IdComponent.h | 6 +++---
 c++/src/H5IntType.h     | 6 +++---
 c++/src/H5Library.h     | 6 +++---
 c++/src/H5Location.h    | 6 +++---
 c++/src/H5Object.h      | 6 +++---
 c++/src/H5PredType.h    | 6 +++---
 c++/src/H5PropList.h    | 6 +++---
 c++/src/H5StrType.h     | 6 +++---
 c++/src/H5VarLenType.h  | 6 +++---
 30 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 192f8cedfb..6635f78be2 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -19,8 +19,8 @@
 // Attribute and DataSet.  It also inherits from H5Object and passes down
 // the services that H5Object provides.
 
-#ifndef _AbstractDs_H
-#define _AbstractDs_H
+#ifndef __AbstractDs_H
+#define __AbstractDs_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -87,4 +87,4 @@ class H5_DLLCPP AbstractDs {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif // _AbstractDs_H
+#endif // __AbstractDs_H
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index 7daafedc58..d2e3c29e86 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -17,8 +17,8 @@
 // Class ArrayType inherits from DataType and provides wrappers for the
 // HDF5 C's Array Datatypes.
 
-#ifndef _H5ArrayType_H
-#define _H5ArrayType_H
+#ifndef __H5ArrayType_H
+#define __H5ArrayType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -59,4 +59,4 @@ class H5_DLLCPP ArrayType : public DataType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5ArrayType_H
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 7c9a891d7e..e8d65136fb 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -19,8 +19,8 @@
 // subclasses.  It also inherits from DataType and passes down the
 // services that are common to all the datatypes.
 
-#ifndef _H5AtomType_H
-#define _H5AtomType_H
+#ifndef __H5AtomType_H
+#define __H5AtomType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -80,4 +80,4 @@ class H5_DLLCPP AtomType : public DataType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5AtomType_H
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index dd37a998b3..2d012059e9 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Attribute_H
-#define _H5Attribute_H
+#ifndef __H5Attribute_H
+#define __H5Attribute_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -99,4 +99,4 @@ class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Attribute_H
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index c3b61ca25c..de7cf4a739 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Classes_H
-#define _H5Classes_H
+#ifndef __H5Classes_H
+#define __H5Classes_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -49,4 +49,4 @@ namespace H5 {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Classes_H
diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index b02b05b848..1748d1d99e 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -18,8 +18,8 @@
 // common services that are provided by H5File and Group.  The file or
 // group in the context of this class is referred to as 'location'.
 
-#ifndef _CommonFG_H
-#define _CommonFG_H
+#ifndef __CommonFG_H
+#define __CommonFG_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -156,5 +156,5 @@ class H5_DLLCPP CommonFG {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __CommonFG_H
 
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index 9b2b5724f5..16ae8396af 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -17,8 +17,8 @@
 // Class CompType inherits from DataType and provides accesses to a compound
 // datatype.
 
-#ifndef _H5CompType_H
-#define _H5CompType_H
+#ifndef __H5CompType_H
+#define __H5CompType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -111,4 +111,4 @@ class H5_DLLCPP CompType : public DataType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5CompType_H
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index ddf4f19974..044108b514 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5CPP_H
-#define _H5CPP_H
+#ifndef __H5Cpp_H
+#define __H5Cpp_H
 
 #include "H5Include.h"
 #include "H5Exception.h"
@@ -56,4 +56,4 @@
 #define HOFFSET(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
-#endif
+#endif // __H5Cpp_H
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index ab3fa7946b..baeca6488f 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from 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'
@@ -88,4 +88,4 @@
 ///	This example shows how to work with groups.
 ///\example     h5group.cpp
 
-#endif
+#endif // __H5CppDoc_H
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index e2fe702d1f..a3a6a760b5 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -16,8 +16,8 @@
 
 // Class DataSet inherits from AbstractDs and provides accesses to a dataset.
 
-#ifndef _H5DataSet_H
-#define _H5DataSet_H
+#ifndef __H5DataSet_H
+#define __H5DataSet_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -120,4 +120,4 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DataSet_H
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index b88144aa63..1ea7188a8c 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5DataSpace_H
-#define _H5DataSpace_H
+#ifndef __H5DataSpace_H
+#define __H5DataSpace_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -131,4 +131,4 @@ class H5_DLLCPP DataSpace : public IdComponent {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DataSpace_H
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index e4254b07c4..104eed4c6d 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5DataType_H
-#define _H5DataType_H
+#ifndef __H5DataType_H
+#define __H5DataType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -129,4 +129,4 @@ class H5_DLLCPP DataType : public H5Object {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DataType_H
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index ac7664e89c..385bc61ef5 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5DSCreatPropList_H
-#define _H5DSCreatPropList_H
+#ifndef __H5DSCreatPropList_H
+#define __H5DSCreatPropList_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -123,4 +123,4 @@ class H5_DLLCPP DSetCreatPropList : public PropList {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DSCreatPropList_H
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index bf481c34a5..b136ba48cc 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5DSetMemXferPropList_H
-#define _H5DSetMemXferPropList_H
+#ifndef __H5DSetMemXferPropList_H
+#define __H5DSetMemXferPropList_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -102,5 +102,5 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DSetMemXferPropList_H
 
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index 914eb664f1..71e36c3858 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5EnumType_H
-#define _H5EnumType_H
+#ifndef __H5EnumType_H
+#define __H5EnumType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -74,4 +74,4 @@ class H5_DLLCPP EnumType : public DataType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5EnumType_H
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index b4af2bafe2..8b12abcda5 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Exception_H
-#define _H5Exception_H
+#ifndef __H5Exception_H
+#define __H5Exception_H
 
 #include <string>
 
@@ -161,4 +161,4 @@ class H5_DLLCPP IdComponentException : public Exception {
 }
 #endif
 
-#endif // _H5Exception_H
+#endif // __H5Exception_H
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 0c2cc21eed..040b3e974e 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5FileAccPropList_H
-#define _H5FileAccPropList_H
+#ifndef __H5FileAccPropList_H
+#define __H5FileAccPropList_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -139,4 +139,4 @@ class H5_DLLCPP FileAccPropList : public PropList {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5FileAccPropList_H
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 61074ea2f0..b11be628e6 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5FileCreatPropList_H
-#define _H5FileCreatPropList_H
+#ifndef __H5FileCreatPropList_H
+#define __H5FileCreatPropList_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -78,4 +78,4 @@ class H5_DLLCPP FileCreatPropList : public PropList {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5FileCreatPropList_H
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 2abffead84..830dda0ecb 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5File_H
-#define _H5File_H
+#ifndef __H5File_H
+#define __H5File_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -112,4 +112,4 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5File_H
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index cbb9541ca7..06148d6089 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5FloatType_H
-#define _H5FloatType_H
+#ifndef __H5FloatType_H
+#define __H5FloatType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -71,4 +71,4 @@ class H5_DLLCPP FloatType : public AtomType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5FloatType_H
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 4003c21e03..a5e324cd0c 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Group_H
-#define _H5Group_H
+#ifndef __H5Group_H
+#define __H5Group_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -68,4 +68,4 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Group_H
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index 17ed5520ff..5a61947643 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _IdComponent_H
-#define _IdComponent_H
+#ifndef __IdComponent_H
+#define __IdComponent_H
 
 // IdComponent represents an HDF5 object that has an identifier.
 
@@ -98,4 +98,4 @@ class H5_DLLCPP IdComponent {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __IdComponent_H
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 53864ee9e3..02efb6457a 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5IntType_H
-#define _H5IntType_H
+#ifndef __H5IntType_H
+#define __H5IntType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -53,4 +53,4 @@ class H5_DLLCPP IntType : public AtomType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5IntType_H
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index a3e1c997a2..c92a943e5f 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Library_H
-#define _H5Library_H
+#ifndef __H5Library_H
+#define __H5Library_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -67,4 +67,4 @@ class H5_DLLCPP H5Library {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Library_H
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index 50278db477..4ea13cdd94 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Location_H
-#define _H5Location_H
+#ifndef __H5Location_H
+#define __H5Location_H
 
 #include "H5Classes.h"		// constains forward class declarations
 
@@ -164,4 +164,4 @@ class H5_DLLCPP H5Location : public IdComponent {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Location_H
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 8441491dbd..3f9c343d0c 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5Object_H
-#define _H5Object_H
+#ifndef __H5Object_H
+#define __H5Object_H
 
 #include "H5Location.h"
 #include "H5Classes.h"		// constains forward class declarations
@@ -61,4 +61,4 @@ class H5_DLLCPP H5Object : public H5Location {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5Object_H
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 5dc5d36ce2..65e1c07b1b 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -19,8 +19,8 @@
 // closed by H5Tclose.  They are treated as constants.
 /////////////////////////////////////////////////////////////////////
 
-#ifndef _H5PredType_H
-#define _H5PredType_H
+#ifndef __H5PredType_H
+#define __H5PredType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -258,4 +258,4 @@ class H5_DLLCPP PredType : public AtomType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5PredType_H
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index a4057d4f62..b2c50d4953 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5PropList_H
-#define _H5PropList_H
+#ifndef __H5PropList_H
+#define __H5PropList_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -121,4 +121,4 @@ class H5_DLLCPP PropList : public IdComponent {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif  // _H5PropList_H
+#endif  // __H5PropList_H
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index be9fed835a..251b0b8089 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -14,8 +14,8 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef _H5StrType_H
-#define _H5StrType_H
+#ifndef __H5StrType_H
+#define __H5StrType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -65,4 +65,4 @@ class H5_DLLCPP StrType : public AtomType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5StrType_H
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index 0cee2195f7..caa347aa15 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -17,8 +17,8 @@
 // Class VarLenType inherits from DataType and provides wrappers for
 // the HDF5 C's Variable-length Datatypes.
 
-#ifndef _H5VarLenType_H
-#define _H5VarLenType_H
+#ifndef __H5VarLenType_H
+#define __H5VarLenType_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -49,4 +49,4 @@ class H5_DLLCPP VarLenType : public DataType {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5VarLenType_H