diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-06-19 22:16:45 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-06-19 22:16:45 (GMT) |
commit | 6063aa87e16561162a7bd192a50c851c200b3150 (patch) | |
tree | 9fd17bb8ed393b4f3e237f2b94949f2050efd884 /src/H5Oprivate.h | |
parent | 3b1acf484e582941fa95173f6feca275800778ac (diff) | |
parent | 48e1bbb0f87c6712189f82a7c5d8835a87d21ee2 (diff) | |
download | hdf5-6063aa87e16561162a7bd192a50c851c200b3150.zip hdf5-6063aa87e16561162a7bd192a50c851c200b3150.tar.gz hdf5-6063aa87e16561162a7bd192a50c851c200b3150.tar.bz2 |
[svn-r27256] Merge revisions 27102 through 27255 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r-- | src/H5Oprivate.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 29f727d..a9a5949 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -639,6 +639,8 @@ typedef struct H5O_btreek_t { * (Data structure in memory) */ typedef struct H5O_drvinfo_t { +/* Information for H5AC cache functions, _must_ be first field in structure */ + H5AC_info_t cache_info; char name[9]; /* Driver name */ size_t len; /* Length of encoded buffer */ uint8_t *buf; /* Buffer for encoded info */ @@ -734,7 +736,7 @@ H5_DLL herr_t H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5_DLL herr_t H5O_open(H5O_loc_t *loc); H5_DLL herr_t H5O_close(H5O_loc_t *loc); H5_DLL int H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id); -H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot); +H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, unsigned prot_flags); H5_DLL H5O_t *H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id); H5_DLL herr_t H5O_unpin(H5O_t *oh); H5_DLL herr_t H5O_dec_rc_by_loc(const H5O_loc_t *loc, hid_t dxpl_id); |