diff options
author | David Young <dyoung@hdfgroup.org> | 2020-08-04 15:22:47 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-08-04 15:22:47 (GMT) |
commit | dc97b9a16569e588dd6c112153b3136003b14ee1 (patch) | |
tree | 2ea651b76195b4c7ef803ae3a518e4f7a6b3daf7 /src/H5Fprivate.h | |
parent | f28c92bb3661f43e9e05a15b78f748eb106adc18 (diff) | |
parent | 33c0016eb63a1d7894bd708cd020ba091a9a9857 (diff) | |
download | hdf5-dc97b9a16569e588dd6c112153b3136003b14ee1.zip hdf5-dc97b9a16569e588dd6c112153b3136003b14ee1.tar.gz hdf5-dc97b9a16569e588dd6c112153b3136003b14ee1.tar.bz2 |
Merge branch 'aug-develop' into aug-merge-attempt/feature/vfd_swmr
Diffstat (limited to 'src/H5Fprivate.h')
-rw-r--r-- | src/H5Fprivate.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index a277543..fdacecd 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -25,15 +25,15 @@ typedef struct H5F_t H5F_t; #include "H5Fpublic.h" /* Public headers needed by this file */ -#include "H5FDpublic.h" /* File drivers */ +#include "H5FDpublic.h" /* File drivers */ /* Private headers needed by this file */ -#include "H5MMprivate.h" /* Memory management */ +#include "H5MMprivate.h" /* Memory management */ #ifdef H5_HAVE_PARALLEL -#include "H5Pprivate.h" /* Property lists */ +#include "H5Pprivate.h" /* Property lists */ #endif /* H5_HAVE_PARALLEL */ -#include "H5VMprivate.h" /* Vectors and arrays */ -#include "H5VLprivate.h" /* Virtual Object Layer */ +#include "H5VMprivate.h" /* Vectors and arrays */ +#include "H5VLprivate.h" /* Virtual Object Layer */ /**************************/ @@ -835,7 +835,6 @@ H5_DLL hsize_t H5F_get_alignment(const H5F_t *f); H5_DLL hsize_t H5F_get_threshold(const H5F_t *f); #ifdef H5_HAVE_PARALLEL H5_DLL H5P_coll_md_read_flag_t H5F_coll_md_read(const H5F_t *f); -H5_DLL void H5F_set_coll_md_read(H5F_t *f, H5P_coll_md_read_flag_t flag); #endif /* H5_HAVE_PARALLEL */ H5_DLL hbool_t H5F_use_mdc_logging(const H5F_t *f); H5_DLL hbool_t H5F_start_mdc_log_on_access(const H5F_t *f); |