diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 21:45:36 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 21:45:36 (GMT) |
| commit | 714252cac5426dd04dd3ab002f200d021c0a7c36 (patch) | |
| tree | 596d75cb6120c975c6b246db5dc7ef8338d0a74e /src/H5Oprivate.h | |
| parent | 1db6be8b65a445ad17c526694509a591d6ace11a (diff) | |
| parent | df8bd7ccd6cd8d50280a3a7d862064c6340e2169 (diff) | |
| download | hdf5-714252cac5426dd04dd3ab002f200d021c0a7c36.zip hdf5-714252cac5426dd04dd3ab002f200d021c0a7c36.tar.gz hdf5-714252cac5426dd04dd3ab002f200d021c0a7c36.tar.bz2 | |
[svn-r27289] 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 628d8f1..6c66680 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -572,6 +572,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 */ @@ -667,7 +669,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); |