summaryrefslogtreecommitdiffstats
path: root/src/H5HGpkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-02 04:33:11 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-02 04:33:11 (GMT)
commitff1c084a4ff54b6eb50d909b29c6e6b1301d0f8d (patch)
tree054d8829a24f04e9e28acadf2d32fda5e6395454 /src/H5HGpkg.h
parent13431c248eca79cff09f66824869e722286f0510 (diff)
downloadhdf5-ff1c084a4ff54b6eb50d909b29c6e6b1301d0f8d.zip
hdf5-ff1c084a4ff54b6eb50d909b29c6e6b1301d0f8d.tar.gz
hdf5-ff1c084a4ff54b6eb50d909b29c6e6b1301d0f8d.tar.bz2
[svn-r18502] Description:
Bring r18501 from metadata journaling "merging" branch to trunk: Extract data structure 'destroy' routines from metadata cache client 'destroy' callbacks. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5HGpkg.h')
-rw-r--r--src/H5HGpkg.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 96be009..7ce18c9 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -128,6 +128,9 @@ typedef struct H5HG_obj_t {
uint8_t *begin; /*ptr to object into heap->chunk*/
} H5HG_obj_t;
+/* Forward declarations for fields */
+struct H5F_file_t;
+
struct H5HG_heap_t {
H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
/* first field in structure */
@@ -139,13 +142,14 @@ struct H5HG_heap_t {
/* If this value is >65535 then all indices */
/* have been used at some time and the */
/* correct new index should be searched for */
+ struct H5F_file_t *shared; /* shared file */
H5HG_obj_t *obj; /*array of object descriptions */
};
/******************************/
/* Package Private Prototypes */
/******************************/
-H5_DLL herr_t H5HG_dest(H5F_t *f, H5HG_heap_t *heap);
+H5_DLL herr_t H5HG_free(H5HG_heap_t *heap);
#endif /* _H5HGpkg_H */