diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-08-04 17:38:25 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-08-04 17:38:25 (GMT) |
| commit | 9bdd3878e7ce878edd2723361e62a6c1e8b246cc (patch) | |
| tree | a67137a8f76ea5cb254f02abfffb1442f99035c5 /src/H5Fprivate.h | |
| parent | e5f061d5a4ecf78d1c74472c59d6dabc70ff9487 (diff) | |
| parent | dc97b9a16569e588dd6c112153b3136003b14ee1 (diff) | |
| download | hdf5-9bdd3878e7ce878edd2723361e62a6c1e8b246cc.zip hdf5-9bdd3878e7ce878edd2723361e62a6c1e8b246cc.tar.gz hdf5-9bdd3878e7ce878edd2723361e62a6c1e8b246cc.tar.bz2 | |
Merge branch 'aug-merge-attempt/feature/vfd_swmr' into aug-merge-attempt/may-merge-mainzer-to-mine
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); |