diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-06 07:55:16 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-06 07:55:16 (GMT) |
| commit | 46d2c5a5d6a83d2d1c3122182628d70fd8955be0 (patch) | |
| tree | 5650b290a517ec9d8b286f642b4c2f44937fd7bd /src/H5HFiblock.c | |
| parent | 14c349be63aca0f796b509eba11261a0b9a876a8 (diff) | |
| download | hdf5-46d2c5a5d6a83d2d1c3122182628d70fd8955be0.zip hdf5-46d2c5a5d6a83d2d1c3122182628d70fd8955be0.tar.gz hdf5-46d2c5a5d6a83d2d1c3122182628d70fd8955be0.tar.bz2 | |
[svn-r29282] Merge of r29081 from trunk (phdf5_metadata_opt branch merge)
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Fortran & C++
autotools parallel (MPICH 3.1.4) w/ Fortran
Diffstat (limited to 'src/H5HFiblock.c')
| -rw-r--r-- | src/H5HFiblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index ce485fe..341f423 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -315,7 +315,7 @@ H5HF_iblock_decr(H5HF_indirect_t *iblock) /* Detach from parent indirect block */ if(iblock->parent) { /* Detach from parent indirect block */ - if(H5HF_man_iblock_detach(iblock->parent, H5AC_dxpl_id, iblock->par_entry) < 0) + if(H5HF_man_iblock_detach(iblock->parent, H5AC_ind_read_dxpl_id, iblock->par_entry) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block") iblock->parent = NULL; iblock->par_entry = 0; @@ -339,7 +339,7 @@ H5HF_iblock_decr(H5HF_indirect_t *iblock) if (!H5F_IS_TMP_ADDR(hdr->f, iblock_addr)) cache_flags |= H5AC__FREE_FILE_SPACE_FLAG; - if(H5AC_expunge_entry(hdr->f, H5AC_dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, cache_flags) < 0) + if(H5AC_expunge_entry(hdr->f, H5AC_ind_read_dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, cache_flags) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove indirect block from cache") } /* end if */ } /* end if */ |