diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 12:49:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 12:49:23 (GMT) |
| commit | 49826ea52c056858a0ec1aac6188dcbce15b7798 (patch) | |
| tree | dd162f823379e3d49f28806a2ee60149b34a78d0 /src/H5Gobj.c | |
| parent | d0c4c5741e4c29e4dc9e67062e2692d6316e2056 (diff) | |
| download | hdf5-49826ea52c056858a0ec1aac6188dcbce15b7798.zip hdf5-49826ea52c056858a0ec1aac6188dcbce15b7798.tar.gz hdf5-49826ea52c056858a0ec1aac6188dcbce15b7798.tar.bz2 | |
[svn-r18452] Description:
Finish renaming cache-related files & symbols on metadata journaling
branch. Metadata cache-related symbols/files with no suffix now have a '1'
suffix and symbols/files with a '2' suffix now have no suffix.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug, prod & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Gobj.c')
| -rw-r--r-- | src/H5Gobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Gobj.c b/src/H5Gobj.c index d79710e..70f1c34 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -888,7 +888,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id) HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links") /* Get a pointer to the object header itself */ - if((oh = H5O_protect(oloc, dxpl_id, H5AC2_WRITE)) == NULL) + if((oh = H5O_protect(oloc, dxpl_id, H5AC_WRITE)) == NULL) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to protect group object header") /* Pin the object header */ @@ -896,7 +896,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id) HGOTO_ERROR(H5E_SYM, H5E_CANTPIN, FAIL, "unable to pin group object header") /* Unprotect the object header */ - if(H5O_unprotect(oloc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0) + if(H5O_unprotect(oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTUNPROTECT, FAIL, "unable to unprotect group object header") /* Inspect links in table for ones that can't be converted back |