diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
| commit | 4a951a53063efa51d3dba672dccd8a59be78ac8f (patch) | |
| tree | d66d2833fdd3e4a1b83e9521b957e99945c82659 /src/H5Oprivate.h | |
| parent | 79fe6d27f022b0124782d6e0c6eb345f2e669095 (diff) | |
| parent | df8bd7ccd6cd8d50280a3a7d862064c6340e2169 (diff) | |
| download | hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.zip hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.gz hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.bz2 | |
[svn-r27286] merge from trunk.
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 b271581..8d58d9c 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -564,6 +564,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 */ @@ -659,7 +661,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); |