diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
| commit | f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67 (patch) | |
| tree | 75db636de976919b35280e21cc13f5cf9070359e /src/H5HLprivate.h | |
| parent | 419b3d66495271b1eff9037e63b2f4bca235316d (diff) | |
| download | hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.zip hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.gz hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.bz2 | |
[svn-r18073] Description:
Bring r18072 from trunk to 1.8 branch:
Bring r18071 from metadata journaling merge branch:
Refactor local heap routines with changes from metadata journaling
branch, along with other misc. changes as the changes on the metadata journaling
branch are being converged with the current state of the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
Linux/64 2.6 (amani) prod
FreeBSD/64 (liberty) prod
Diffstat (limited to 'src/H5HLprivate.h')
| -rw-r--r-- | src/H5HLprivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index 2a3e2df..df2ec62 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -62,10 +62,10 @@ typedef struct H5HL_t H5HL_t; */ H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr/*out*/); H5_DLL H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw); -H5_DLL void *H5HL_offset_into(H5F_t *f, const H5HL_t *heap, size_t offset); +H5_DLL void *H5HL_offset_into(const H5HL_t *heap, size_t offset); H5_DLL herr_t H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size); -H5_DLL herr_t H5HL_unprotect(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, haddr_t addr); +H5_DLL herr_t H5HL_unprotect(H5F_t *f, H5HL_t *heap); H5_DLL size_t H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t size, const void *buf); H5_DLL herr_t H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr); |