summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-03 20:15:55 (GMT)
committerGitHub <noreply@github.com>2021-03-03 20:15:55 (GMT)
commite65814bf8eda709b27a60fe3e396a22e4bc34864 (patch)
treec9f9cc67a4dd93453cc4bf7054b5a8192e663337 /c++/src
parentc14fa9cebf58213bc4e2c0ac87e520c473e14071 (diff)
downloadhdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.zip
hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.gz
hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.bz2
1 10 merges from develop (#419)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/H5ArrayType.h6
-rw-r--r--c++/src/H5AtomType.h6
-rw-r--r--c++/src/H5Attribute.cpp2
-rw-r--r--c++/src/H5Attribute.h6
-rw-r--r--c++/src/H5Classes.h6
-rw-r--r--c++/src/H5CompType.h6
-rw-r--r--c++/src/H5Cpp.h6
-rw-r--r--c++/src/H5CppDoc.h6
-rw-r--r--c++/src/H5DaccProp.h6
-rw-r--r--c++/src/H5DataSet.h6
-rw-r--r--c++/src/H5DataSpace.h6
-rw-r--r--c++/src/H5DataType.h6
-rw-r--r--c++/src/H5DcreatProp.h6
-rw-r--r--c++/src/H5DxferProp.h6
-rw-r--r--c++/src/H5EnumType.h6
-rw-r--r--c++/src/H5Exception.h6
-rw-r--r--c++/src/H5FaccProp.h6
-rw-r--r--c++/src/H5FcreatProp.h6
-rw-r--r--c++/src/H5File.h6
-rw-r--r--c++/src/H5FloatType.h6
-rw-r--r--c++/src/H5IntType.h6
-rw-r--r--c++/src/H5LaccProp.h6
-rw-r--r--c++/src/H5LcreatProp.h6
-rw-r--r--c++/src/H5Library.h6
-rw-r--r--c++/src/H5Location.h6
-rw-r--r--c++/src/H5Object.cpp15
-rw-r--r--c++/src/H5Object.h6
-rw-r--r--c++/src/H5OcreatProp.h6
-rw-r--r--c++/src/H5PredType.cpp3
-rw-r--r--c++/src/H5PredType.h6
-rw-r--r--c++/src/H5PropList.h6
-rw-r--r--c++/src/H5StrType.cpp3
-rw-r--r--c++/src/H5StrType.h6
-rw-r--r--c++/src/H5VarLenType.h6
34 files changed, 105 insertions, 98 deletions
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index c2a6493..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 {
@@ -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 f5664b8..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 {
@@ -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 08367c5..81e656f 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -41,7 +41,7 @@ namespace H5 {
using std::cerr;
using std::endl;
-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 5a13c2e..41e5a31 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 {
@@ -104,4 +104,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 42e3d69..7820ce2 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;
@@ -43,4 +43,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 6d2ce7e..6a4c093 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 {
@@ -124,4 +124,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 8fea1f9..9272bdb 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"
@@ -58,4 +58,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 29f3afc..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'
@@ -92,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/H5DaccProp.h b/c++/src/H5DaccProp.h
index 627c4a4..7d6b250 100644
--- a/c++/src/H5DaccProp.h
+++ b/c++/src/H5DaccProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DSetAccPropList_H
-#define __H5DSetAccPropList_H
+#ifndef H5DSetAccPropList_H
+#define H5DSetAccPropList_H
namespace H5 {
@@ -69,4 +69,4 @@ class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
}; // end of DSetAccPropList
} // namespace H5
-#endif // __H5DSetAccPropList_H
+#endif // H5DSetAccPropList_H
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index c07aad5..c745470 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 {
@@ -153,4 +153,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 14d030f..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 {
@@ -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 f97f806..49f5348 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 {
@@ -183,4 +183,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 74c4be0..3c032ee 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 {
@@ -159,4 +159,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 cb4c2c3..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 {
@@ -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 b228d31..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 {
@@ -87,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 c7b117b..566c818 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Exception_H
-#define __H5Exception_H
+#ifndef H5Exception_H
+#define H5Exception_H
#include <string>
@@ -176,4 +176,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 a02e250..998f870 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 {
@@ -168,4 +168,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 2b3f46f..00ae0b1 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 {
@@ -109,4 +109,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 a350b47..b107f67 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 {
@@ -127,4 +127,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 e254646..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 {
@@ -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/H5IntType.h b/c++/src/H5IntType.h
index 7841518..185c8f0 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 {
@@ -66,4 +66,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 e6cf888..4fa516c 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 {
@@ -70,4 +70,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 e5a9d7a..aea38e7 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 {
@@ -77,4 +77,4 @@ class H5_DLLCPP LinkCreatPropList : public PropList {
}; // end of LinkCreatPropList
} // namespace H5
-#endif // __H5LinkCreatPropList_H
+#endif // H5LinkCreatPropList_H
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index 9a73eee..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 {
@@ -69,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 a749cdd..7d40fb0 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
@@ -321,4 +321,4 @@ class H5_DLLCPP H5Location : public IdComponent {
}; // end of H5Location
} // namespace H5
-#endif // __H5Location_H
+#endif // H5Location_H
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 7bd5479..7e3d14d 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -42,8 +42,11 @@ namespace H5 {
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// userAttrOpWrpr interfaces between the user's function and the
// C library function H5Aiterate2
-extern "C" herr_t
-userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, void *op_data)
+extern "C" {
+
+static herr_t
+userAttrOpWrpr(H5_ATTR_UNUSED hid_t loc_id, const char *attr_name, H5_ATTR_UNUSED const H5A_info_t *ainfo,
+ void *op_data)
{
H5std_string s_attr_name = H5std_string(attr_name);
UserData4Aiterate *myData = reinterpret_cast<UserData4Aiterate *>(op_data);
@@ -52,9 +55,9 @@ userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, voi
}
// userVisitOpWrpr interfaces between the user's function and the
-// C library function H5Ovisit2
-extern "C" herr_t
-userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info, void *op_data)
+// C library function H5Ovisit3
+static herr_t
+userVisitOpWrpr(H5_ATTR_UNUSED hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info, void *op_data)
{
H5std_string s_attr_name = H5std_string(attr_name);
UserData4Visit *myData = reinterpret_cast<UserData4Visit *>(op_data);
@@ -62,6 +65,8 @@ userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info,
return status;
}
+} // extern "C"
+
//--------------------------------------------------------------------------
// Function: H5Object default constructor (protected)
// Programmer Binh-Minh Ribler - 2000
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index b11c895..baf38f1 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 {
@@ -132,4 +132,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 ec6e9c8..7f6d411 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 {
@@ -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.cpp b/c++/src/H5PredType.cpp
index dd70353..b58569f 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -27,6 +27,7 @@
#include "H5DataType.h"
#include "H5AtomType.h"
#include "H5PredType.h"
+#include "H5private.h"
namespace H5 {
@@ -82,7 +83,7 @@ PredType::operator=(const PredType &rhs)
// These dummy functions do not inherit from DataType - they'll
// throw an DataTypeIException if invoked.
void
-PredType::commit(H5Location &loc, const char *name)
+PredType::commit(H5_ATTR_UNUSED H5Location &loc, H5_ATTR_UNUSED const char *name)
{
throw DataTypeIException("PredType::commit",
"Error: Attempted to commit a predefined datatype. Invalid operation!");
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index c3ba6a2..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 {
@@ -442,4 +442,4 @@ class H5_DLLCPP PredType : public AtomType {
}; // end of PredType
} // namespace H5
-#endif // __H5PredType_H
+#endif // H5PredType_H
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index cdd9619..12c8b4b 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 {
@@ -144,4 +144,4 @@ class H5_DLLCPP PropList : public IdComponent {
}; // end of PropList
} // namespace H5
-#endif // __H5PropList_H
+#endif // H5PropList_H
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 7bbe3ab..473cab3 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -32,6 +32,7 @@
#include "H5StrType.h"
#include "H5DataSet.h"
#include "H5PredType.h"
+#include "H5private.h"
namespace H5 {
@@ -102,7 +103,7 @@ StrType::StrType(const PredType &pred_type, const size_t &size) : AtomType()
// This constructor replaced the previous one.
// Programmer Binh-Minh Ribler - Nov 28, 2005
//--------------------------------------------------------------------------
-StrType::StrType(const int dummy, const size_t &size) : AtomType()
+StrType::StrType(H5_ATTR_UNUSED const int dummy, const size_t &size) : AtomType()
{
// use DataType::copy to make a copy of the string predefined type
// then set its length
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index b24cbef..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 {
@@ -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 674b49d..f767e0e 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 {
@@ -61,4 +61,4 @@ class H5_DLLCPP VarLenType : public DataType {
}; // end of VarLenType
} // namespace H5
-#endif // __H5VarLenType_H
+#endif // H5VarLenType_H