diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-09-26 17:45:07 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-09-26 17:45:07 (GMT) |
| commit | 06fa8a94558939400dc43e99c08a784e26dfa01d (patch) | |
| tree | 8d353cf95fb7f0dab2ab7a53a24035805017b781 /src/H5ACprivate.h | |
| parent | c8b38985ff8f6cf38ada4a4d13e6d977aec260d5 (diff) | |
| parent | ab84c029c492ce8c9d3bac8e03bf07e760de9cd7 (diff) | |
| download | hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.zip hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.tar.gz hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into feature/vfd_swmr
Conflicts:
src/H5AC.c
src/H5F.c
src/H5Pfapl.c
Resolve conflicts for H5AC.c, H5F.c and H5Pfapl.c
Diffstat (limited to 'src/H5ACprivate.h')
| -rw-r--r-- | src/H5ACprivate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 36872c4..a7e8493 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -435,7 +435,7 @@ H5_DLL herr_t H5AC_get_mdc_image_info(H5AC_t *cache_ptr, haddr_t *image_addr, /* Tag & Ring routines */ H5_DLL void H5AC_tag(haddr_t metadata_tag, haddr_t *prev_tag); H5_DLL herr_t H5AC_flush_tagged_metadata(H5F_t *f, haddr_t metadata_tag); -H5_DLL herr_t H5AC_evict_tagged_metadata(H5F_t * f, haddr_t metadata_tag, hbool_t match_global); +H5_DLL herr_t H5AC_evict_tagged_metadata(H5F_t *f, haddr_t metadata_tag, hbool_t match_global); H5_DLL herr_t H5AC_retag_copied_metadata(const H5F_t *f, haddr_t metadata_tag); H5_DLL herr_t H5AC_ignore_tags(const H5F_t *f); H5_DLL herr_t H5AC_cork(H5F_t *f, haddr_t obj_addr, unsigned action, hbool_t *corked); |