diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-05 22:08:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 22:08:22 (GMT) |
| commit | 089a6f60ace8f87c049f5e618b77394c2cec2b4c (patch) | |
| tree | a4d2a58bc1af8dc7c34897be88041f20918d9ffc /c++ | |
| parent | c1da03ef099fdc898e205bf5f80f328daf795421 (diff) | |
| download | hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.zip hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.tar.gz hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.tar.bz2 | |
1 8 Merges from develop (#432)
* 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
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync
* format alignment
* initialize vars
* revert H5private change
* Merge #380 from develop
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/H5AbstractDs.h | 6 | ||||
| -rw-r--r-- | c++/src/H5AcreatProp.h | 6 | ||||
| -rw-r--r-- | c++/src/H5CommonFG.h | 16 | ||||
| -rw-r--r-- | c++/src/H5Group.h | 6 | ||||
| -rw-r--r-- | c++/src/H5IdComponent.h | 6 | ||||
| -rw-r--r-- | c++/src/H5StrcreatProp.h | 6 |
6 files changed, 28 insertions, 18 deletions
diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h index f502c9f..48c4c27 100644 --- a/c++/src/H5AbstractDs.h +++ b/c++/src/H5AbstractDs.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __AbstractDs_H -#define __AbstractDs_H +#ifndef AbstractDs_H +#define AbstractDs_H namespace H5 { @@ -95,4 +95,4 @@ class H5_DLLCPP AbstractDs { }; // end of AbstractDs } // namespace H5 -#endif // __AbstractDs_H +#endif // AbstractDs_H diff --git a/c++/src/H5AcreatProp.h b/c++/src/H5AcreatProp.h index 6be2506..b49c63a 100644 --- a/c++/src/H5AcreatProp.h +++ b/c++/src/H5AcreatProp.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __H5AttrCreatPropList_H -#define __H5AttrCreatPropList_H +#ifndef H5AttrCreatPropList_H +#define H5AttrCreatPropList_H namespace H5 { @@ -63,4 +63,4 @@ class H5_DLLCPP AttrCreatPropList : public StrCreatPropList { } // namespace H5 -#endif // __H5AttrCreatPropList_H +#endif // H5AttrCreatPropList_H diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h index a0b2a69..1f65044 100644 --- a/c++/src/H5CommonFG.h +++ b/c++/src/H5CommonFG.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __CommonFG_H -#define __CommonFG_H +#ifndef CommonFG_H +#define CommonFG_H namespace H5 { @@ -176,4 +176,14 @@ class H5_DLLCPP CommonFG { }; // end of CommonFG } // namespace H5 -#endif // __CommonFG_H +#endif // CommonFG_H + +/*************************************************************************** + Design Note + =========== + +September 2017: + + This class used to be base class of H5File as well, until the + restructure that moved H5File to be subclass of H5Group. +*/ diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h index bbd460d..f3d692f 100644 --- a/c++/src/H5Group.h +++ b/c++/src/H5Group.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __Group_H -#define __Group_H +#ifndef Group_H +#define Group_H namespace H5 { @@ -80,4 +80,4 @@ class H5_DLLCPP Group : public H5Object, public CommonFG { }; // end of Group } // namespace H5 -#endif // __Group_H +#endif // Group_H diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h index 5a5d1fb..58e39b6 100644 --- a/c++/src/H5IdComponent.h +++ b/c++/src/H5IdComponent.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __IdComponent_H -#define __IdComponent_H +#ifndef IdComponent_H +#define IdComponent_H namespace H5 { @@ -124,4 +124,4 @@ class H5_DLLCPP IdComponent { }; // end class IdComponent } // namespace H5 -#endif // __IdComponent_H +#endif // IdComponent_H diff --git a/c++/src/H5StrcreatProp.h b/c++/src/H5StrcreatProp.h index 96efa4d..710fac5 100644 --- a/c++/src/H5StrcreatProp.h +++ b/c++/src/H5StrcreatProp.h @@ -12,8 +12,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef __H5StrCreatPropList_H -#define __H5StrCreatPropList_H +#ifndef H5StrCreatPropList_H +#define H5StrCreatPropList_H namespace H5 { @@ -58,4 +58,4 @@ class H5_DLLCPP StrCreatPropList : public PropList { } // namespace H5 -#endif // __H5StrCreatPropList_H +#endif // H5StrCreatPropList_H |