summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-11-10 19:36:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-11-10 19:36:28 (GMT)
commitd60e16be79a5a6595c31dc1141c839036eae6486 (patch)
treecec06bfc62ed08080dc7bc36bd695c0c4b26c173
parentd28d9e24e953d284592726fe6c59c72ff2f27cb2 (diff)
downloadhdf5-d60e16be79a5a6595c31dc1141c839036eae6486.zip
hdf5-d60e16be79a5a6595c31dc1141c839036eae6486.tar.gz
hdf5-d60e16be79a5a6595c31dc1141c839036eae6486.tar.bz2
[svn-r9516] Purpose:
Bug fix Description: Fix code to allow --debug-enable=all option to work correctly. Solution: Update some ifdef'ed code with recent changes. Platforms tested: Linux 2.4 (heping) w/--enable-debug=all Too minor to require h5committest
-rw-r--r--src/H5B.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5B.c b/src/H5B.c
index d17e5df..0162d7b 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -2271,6 +2271,7 @@ static herr_t
H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void *udata)
{
H5B_t *bt = NULL;
+ H5B_shared_t *shared; /* Pointer to shared B-tree info */
int i, ncell, cmp;
static int ncalls = 0;
herr_t status;
@@ -2293,6 +2294,8 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
/* Initialize the queue */
bt = H5AC_protect(f, dxpl_id, H5AC_BT, addr, type, udata, H5AC_READ);
assert(bt);
+ shared=H5RC_GET_OBJ(bt->rc_shared);
+ HDassert(shared);
cur = H5MM_calloc(sizeof(struct child_t));
assert (cur);
cur->addr = addr;
@@ -2346,8 +2349,8 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
tail = tmp;
/* Check that the keys are monotonically increasing */
- cmp = (type->cmp2) (f, dxpl_id, H5B_NKEY(bt,i), udata,
- H5B_NKEY(bt,i+1));
+ cmp = (type->cmp2) (f, dxpl_id, H5B_NKEY(bt,shared,i), udata,
+ H5B_NKEY(bt,shared,i+1));
assert(cmp < 0);
}
}