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/H5Fpublic.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/H5Fpublic.h')
| -rw-r--r-- | src/H5Fpublic.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index fc86c6a..28ba17d 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -14,8 +14,8 @@ /* * This file contains public declarations for the H5F module. */ -#ifndef _H5Fpublic_H -#define _H5Fpublic_H +#ifndef H5Fpublic_H +#define H5Fpublic_H /* Public header files needed by this file */ #include "H5public.h" @@ -24,19 +24,19 @@ /* When this header is included from a private header, don't make calls to H5check() */ #undef H5CHECK -#ifndef _H5private_H +#ifndef H5private_H #define H5CHECK H5check(), -#else /* _H5private_H */ +#else /* H5private_H */ #define H5CHECK -#endif /* _H5private_H */ +#endif /* H5private_H */ /* When this header is included from a private HDF5 header, don't make calls to H5open() */ #undef H5OPEN -#ifndef _H5private_H +#ifndef H5private_H #define H5OPEN H5open(), -#else /* _H5private_H */ +#else /* H5private_H */ #define H5OPEN -#endif /* _H5private_H */ +#endif /* H5private_H */ /* * These are the bits that can be passed to the `flags' argument of @@ -75,7 +75,7 @@ /* Value passed to H5Pset_elink_acc_flags to cause flags to be taken from the * parent file. */ -#define H5F_ACC_DEFAULT (H5CHECK H5OPEN 0xffffu) /*ignore setting on lapl */ +#define H5F_ACC_DEFAULT (H5CHECK H5OPEN 0xffffu) /* ignore setting on lapl */ /* Flags for H5Fget_obj_count() & H5Fget_obj_ids() calls */ #define H5F_OBJ_FILE (0x0001u) /* File objects */ @@ -309,4 +309,4 @@ H5_DLL herr_t H5Fset_latest_format(hid_t file_id, hbool_t latest_format); #ifdef __cplusplus } #endif -#endif /* _H5Fpublic_H */ +#endif /* H5Fpublic_H */ |