diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 22:01:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 22:01:24 (GMT) |
| commit | fa279bfcb7bb294e5e2611453e2b778f76752844 (patch) | |
| tree | 8d32ddf37c5d023fb69208cf86fd503239bdf856 /src/H5Opkg.h | |
| parent | eeb841b26bdd371f2e3ae506af6390828205691a (diff) | |
| download | hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.zip hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.tar.gz hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.tar.bz2 | |
[svn-r18526] Description:
Bring r18525 from trunk to 1.8 branch:
Bring r18523 from metadata journaling "merging" branch to trunk:
Bring metadata journaling branch into closer correspondence with trunk:
extract data structure freeing routines from metadata cache client 'destroy'
callbacks.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Opkg.h')
| -rw-r--r-- | src/H5Opkg.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/H5Opkg.h b/src/H5Opkg.h index 262a7dc..25cea5a 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -474,6 +474,7 @@ H5_DLL herr_t H5O_flush_msgs(H5F_t *f, H5O_t *oh); H5_DLL hid_t H5O_open_by_loc(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref); H5_DLL herr_t H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_mesg_t *mesg); H5_DLL const H5O_obj_class_t *H5O_obj_class_real(H5O_t *oh); +H5_DLL herr_t H5O_free(H5O_t *oh); /* Object header message routines */ H5_DLL unsigned H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, @@ -534,9 +535,6 @@ H5_DLL herr_t H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, /* These functions operate on object locations */ H5_DLL H5O_loc_t *H5O_get_loc(hid_t id); -/* Useful metadata cache callbacks */ -H5_DLL herr_t H5O_dest(H5F_t *f, H5O_t *oh); - /* Testing functions */ #ifdef H5O_TESTING H5_DLL htri_t H5O_is_attr_empty_test(hid_t oid); |