diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-24 20:55:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-24 20:55:19 (GMT) |
| commit | 96d5da7f1ad681573d42d2a4fd9e422fe049442d (patch) | |
| tree | 6e2c3edf6325390b6cede7ee07daa7ff87b52950 /src/H5FSpkg.h | |
| parent | 9045cf049f74e017e20ed366d9a811a7902cf8ff (diff) | |
| parent | e96bd2d46e208e0eb6c62cfcc4f86141f933884e (diff) | |
| download | hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.zip hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.tar.gz hdf5-96d5da7f1ad681573d42d2a4fd9e422fe049442d.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e96bd2d46e208e0eb6c62cfcc4f86141f933884e':
CMake changes for SKIPPED and flush tests
H5S adjust callbacks now return an herr_t instead of void.
Normalization with vol_integration (property lists, file drivers, other misc).
Diffstat (limited to 'src/H5FSpkg.h')
| -rw-r--r-- | src/H5FSpkg.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h index f160055..2c56ab6 100644 --- a/src/H5FSpkg.h +++ b/src/H5FSpkg.h @@ -215,24 +215,22 @@ H5FL_EXTERN(H5FS_t); /******************************/ /* Generic routines */ -H5_DLL herr_t H5FS__create_flush_depend(H5AC_info_t *parent_entry, - H5AC_info_t *child_entry); -H5_DLL herr_t H5FS__destroy_flush_depend(H5AC_info_t *parent_entry, - H5AC_info_t *child_entry); +H5_DLL herr_t H5FS__create_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry); +H5_DLL herr_t H5FS__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry); /* Free space manager header routines */ H5_DLL H5FS_t *H5FS__new(const H5F_t *f, uint16_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata); -H5_DLL herr_t H5FS_incr(H5FS_t *fspace); -H5_DLL herr_t H5FS_decr(H5FS_t *fspace); -H5_DLL herr_t H5FS_dirty(H5FS_t *fspace); +H5_DLL herr_t H5FS__incr(H5FS_t *fspace); +H5_DLL herr_t H5FS__decr(H5FS_t *fspace); +H5_DLL herr_t H5FS__dirty(H5FS_t *fspace); /* Free space section routines */ -H5_DLL H5FS_sinfo_t *H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace); +H5_DLL H5FS_sinfo_t *H5FS__sinfo_new(H5F_t *f, H5FS_t *fspace); /* Routines for destroying structures */ H5_DLL herr_t H5FS__hdr_dest(H5FS_t *hdr); -H5_DLL herr_t H5FS_sinfo_dest(H5FS_sinfo_t *sinfo); +H5_DLL herr_t H5FS__sinfo_dest(H5FS_sinfo_t *sinfo); /* Sanity check routines */ #ifdef H5FS_DEBUG_ASSERT |