diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-03 20:15:55 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-03 20:15:55 (GMT) |
commit | e65814bf8eda709b27a60fe3e396a22e4bc34864 (patch) | |
tree | c9f9cc67a4dd93453cc4bf7054b5a8192e663337 /src/hdf5.h | |
parent | c14fa9cebf58213bc4e2c0ac87e520c473e14071 (diff) | |
download | hdf5-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 'src/hdf5.h')
-rw-r--r-- | src/hdf5.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -16,8 +16,8 @@ * a particular header file and include that here, don't fill this file with * lots of gunk... */ -#ifndef _HDF5_H -#define _HDF5_H +#ifndef HDF5_H +#define HDF5_H #include "H5public.h" #include "H5Apublic.h" /* Attributes */ |