diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-11-23 20:52:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-11-23 20:52:33 (GMT) |
| commit | e3c415fe5a345a6a42001b60c1b0e0f4a2ff9ed3 (patch) | |
| tree | 91b76174913b0e5caa4b40fa27bd16c6cc4bb122 /src/H5B.c | |
| parent | 8830acb2cbc9384978c22a3e01f4dd15276290e5 (diff) | |
| download | hdf5-e3c415fe5a345a6a42001b60c1b0e0f4a2ff9ed3.zip hdf5-e3c415fe5a345a6a42001b60c1b0e0f4a2ff9ed3.tar.gz hdf5-e3c415fe5a345a6a42001b60c1b0e0f4a2ff9ed3.tar.bz2 | |
[svn-r28452] Description:
Normalization changes against revise_chunks branch.
Tested on:
MacOSX/64 10.11.1 (amazon) w/serial & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5B.c')
| -rw-r--r-- | src/H5B.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -531,6 +531,7 @@ H5B__split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx, } /* end if */ bt_ud->bt->right = split_bt_ud->addr; + HDassert(bt_ud->cache_flags & H5AC__DIRTIED_FLAG); done: if(ret_value < 0) { @@ -647,7 +648,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void /* Unprotect the old root so we can move it. Also force it to be marked * dirty so it is written to the new location. */ if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt_ud.addr, bt_ud.bt, H5AC__DIRTIED_FLAG) < 0) - HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release old root") + HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release old root") bt_ud.bt = NULL; /* Make certain future references will be caught */ /* Move the location of the old root on the disk */ @@ -1060,7 +1061,7 @@ H5B__insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, bt->child[idx] = new_child_bt_ud.addr; bt_ud->cache_flags |= H5AC__DIRTIED_FLAG; } else if(H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) { - hbool_t *tmp_bt_flags_ptr = NULL; + unsigned *tmp_bt_flags_ptr = NULL; H5B_t *tmp_bt; /* |