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/H5B2int.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/H5B2int.c')
| -rw-r--r-- | src/H5B2int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5B2int.c b/src/H5B2int.c index 092c7ba..f8b5223 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -4630,7 +4630,7 @@ H5B2__shadow_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth, node_protected = FALSE; /* Move the location of the old child on the disk */ - if(H5AC_move_entry(hdr->f, H5AC_BT2_INT, curr_node_ptr->addr, new_node_addr, H5AC_dxpl_id) < 0) + if(H5AC_move_entry(hdr->f, H5AC_BT2_INT, curr_node_ptr->addr, new_node_addr, H5AC_ind_read_dxpl_id) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTMOVE, FAIL, "unable to move B-tree node") curr_node_ptr->addr = new_node_addr; @@ -4739,7 +4739,7 @@ H5B2__shadow_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, node_protected = FALSE; /* Move the location of the old child on the disk */ - if(H5AC_move_entry(hdr->f, H5AC_BT2_LEAF, curr_node_ptr->addr, new_node_addr, H5AC_dxpl_id) < 0) + if(H5AC_move_entry(hdr->f, H5AC_BT2_LEAF, curr_node_ptr->addr, new_node_addr, H5AC_ind_read_dxpl_id) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTMOVE, FAIL, "unable to move B-tree node") curr_node_ptr->addr = new_node_addr; |