[svn-r9517] 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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/H5B.c b/src/H5B.c
index 2c660c4..1da136d 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -2275,6 +2275,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;
@@ -2297,6 +2298,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;
@@ -2350,8 +2353,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);
 	    }
 	}