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/H5HFiter.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/H5HFiter.c')
| -rw-r--r-- | src/H5HFiter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFiter.c b/src/H5HFiter.c index d69e314..4dbb186 100644 --- a/src/H5HFiter.c +++ b/src/H5HFiter.c @@ -216,7 +216,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id, } /* end else */ /* Load indirect block for this context location */ - if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent, iblock_par_entry, FALSE, H5AC2_WRITE, &did_protect))) + if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent, iblock_par_entry, FALSE, H5AC_WRITE, &did_protect))) HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block") /* Make indirect block the context for the current location */ @@ -227,7 +227,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id, HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block") /* Release the current indirect block */ - if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0) + if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block") iblock = NULL; |