diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-03 20:15:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 20:15:29 (GMT) |
| commit | c1da03ef099fdc898e205bf5f80f328daf795421 (patch) | |
| tree | 4303cc7574140b82824855b04887b69a77f1ec3c /c++/src/H5AtomType.h | |
| parent | d1475f524507186ad393ae2f1a93fba8126a4881 (diff) | |
| download | hdf5-c1da03ef099fdc898e205bf5f80f328daf795421.zip hdf5-c1da03ef099fdc898e205bf5f80f328daf795421.tar.gz hdf5-c1da03ef099fdc898e205bf5f80f328daf795421.tar.bz2 | |
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
Diffstat (limited to 'c++/src/H5AtomType.h')
| -rw-r--r-- | c++/src/H5AtomType.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 |