summaryrefslogtreecommitdiffstats
path: root/src/H5HLprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-10-13 06:24:09 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-10-13 06:24:09 (GMT)
commitbc010e55565dd53a40cb0187afe34f8506a990e2 (patch)
tree6c7f151b90c569a4fd6465ee30c58edef3050127 /src/H5HLprivate.h
parent63f71aca9177fa4642cda8298a7b7c5c1eb5761e (diff)
downloadhdf5-bc010e55565dd53a40cb0187afe34f8506a990e2.zip
hdf5-bc010e55565dd53a40cb0187afe34f8506a990e2.tar.gz
hdf5-bc010e55565dd53a40cb0187afe34f8506a990e2.tar.bz2
[svn-r15840] Description:
Convert local heap cache client to use metadata journaling cache. Other minor cleanups & simplifications, etc. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.2 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5HLprivate.h')
-rw-r--r--src/H5HLprivate.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index d8a4b49..26f2cb7 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -33,7 +33,7 @@
/* Private headers needed by this file. */
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
+#include "H5AC2private.h" /* Metadata cache */
#include "H5Fprivate.h" /* File access */
/*
@@ -64,11 +64,11 @@ typedef struct H5HL_t H5HL_t;
* Library prototypes...
*/
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 H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw);
+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(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);