diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2012-10-12 03:23:08 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2012-10-12 03:23:08 (GMT) |
| commit | 75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d (patch) | |
| tree | 231f8995f999d21e2ee96d6be012b1f2805d4134 /src/H5B2int.c | |
| parent | d2f3c1b991b1990fe70afa64b3ca1941165a94c4 (diff) | |
| download | hdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.zip hdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.tar.gz hdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.tar.bz2 | |
[svn-r22887] Purpose:
Fixes a variety of compile warnings and issues in the B-tree
and heap code.
Tested on:
jam
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 7f56352..c741d5a 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -2957,7 +2957,7 @@ H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, HDmemcpy(native, node_native, (hdr->cls->nrec_size * curr_node->node_nrec)); /* Unlock the node */ - if(H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, hdr->swmr_write ? H5AC__PIN_ENTRY_FLAG : H5AC__NO_FLAGS_SET) < 0) + if(H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, (unsigned)(hdr->swmr_write ? H5AC__PIN_ENTRY_FLAG : H5AC__NO_FLAGS_SET)) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node") if(hdr->swmr_write) node_pinned = TRUE; @@ -4033,7 +4033,7 @@ H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, done: /* Unlock & delete current node */ - if(node && H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, H5AC__DELETED_FLAG | (hdr->swmr_write ? 0 : H5AC__FREE_FILE_SPACE_FLAG)) < 0) + if(node && H5AC_unprotect(hdr->f, dxpl_id, curr_node_class, curr_node->addr, node, (unsigned)(H5AC__DELETED_FLAG | (hdr->swmr_write ? 0 : H5AC__FREE_FILE_SPACE_FLAG))) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node") FUNC_LEAVE_NOAPI(ret_value) |