summaryrefslogtreecommitdiffstats
path: root/src/H5Oprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-06-04 15:31:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-06-04 15:31:50 (GMT)
commitf4f0c14939c625594989e714cbe74dad46afbee3 (patch)
tree0626fed6469476a49eee9fc42aa34aac3926e36d /src/H5Oprivate.h
parentaf7d1c4cd4e088d7e068cc2374983019eb262152 (diff)
downloadhdf5-f4f0c14939c625594989e714cbe74dad46afbee3.zip
hdf5-f4f0c14939c625594989e714cbe74dad46afbee3.tar.gz
hdf5-f4f0c14939c625594989e714cbe74dad46afbee3.tar.bz2
[svn-r17004] Description:
Bring r17002 from trunk to 1.8 branch: Rename H5O_protect/H5O_unprotect to be H5O_pin/H5O_unpin, since that's what that are actually doing. Add counter of the number of times the object header is pinned, to allow H5O_pin/H5O_unpin to be called reentrantly. Tested on: Mac OS X/32 10.5.7 (amazon) w/debug & prod h5committest already run for trunk version of change
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r--src/H5Oprivate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index c9c4b27..3e60186 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -571,8 +571,8 @@ 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 int H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, unsigned *oh_flags);
-H5_DLL H5O_t *H5O_protect(H5O_loc_t *loc, hid_t dxpl_id);
-H5_DLL herr_t H5O_unprotect(H5O_loc_t *loc, H5O_t *oh);
+H5_DLL H5O_t *H5O_pin(H5O_loc_t *loc, hid_t dxpl_id);
+H5_DLL herr_t H5O_unpin(H5O_loc_t *loc, H5O_t *oh);
H5_DLL herr_t H5O_touch(H5O_loc_t *loc, hbool_t force, hid_t dxpl_id);
H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
hbool_t force);