diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-03 07:16:18 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-03 07:16:18 (GMT) |
commit | ebdfc3e61f77cde09c45e62a0857e8889f6582ab (patch) | |
tree | cbf4ec435f23918c9072acf2a5549cbb6be12116 /src/H5B2int.c | |
parent | 611ff7258937a90cc63ff4084f6eed421a0ba320 (diff) | |
download | hdf5-ebdfc3e61f77cde09c45e62a0857e8889f6582ab.zip hdf5-ebdfc3e61f77cde09c45e62a0857e8889f6582ab.tar.gz hdf5-ebdfc3e61f77cde09c45e62a0857e8889f6582ab.tar.bz2 |
[svn-r29253] Merge of r29057 from trunk (dxpl checks in debug builds)
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Fortran and C++
autotools parallel (MPICH 3.1.4) w/ Fortran
bin/cmakehdf5 (CMake 3.3.2)
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 8f6cf7a..092c7ba 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) < 0) + if(H5AC_move_entry(hdr->f, H5AC_BT2_INT, curr_node_ptr->addr, new_node_addr, H5AC_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) < 0) + if(H5AC_move_entry(hdr->f, H5AC_BT2_LEAF, curr_node_ptr->addr, new_node_addr, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTMOVE, FAIL, "unable to move B-tree node") curr_node_ptr->addr = new_node_addr; |