[svn-r9778] Purpose:

    Remove feature

Description:
    Retire threaded, balanced binary tree code from HDF5 use.  Requiescat in
    pace...

    Also, regenerate dependencies files.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require full h5committesting  (the code is already
    disconnected from everything except its tests)

5 files changed, 116 insertions, 260 deletions

diff --git a/test/Dependencies b/test/Dependencies
index d452485..73d4b4a 100644
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -230,10 +230,11 @@ cache.lo: \
    $(top_srcdir)/src/H5MPprivate.h \
    $(top_srcdir)/src/H5FSprivate.h \
    $(top_srcdir)/src/H5Iprivate.h \
-   $(top_srcdir)/src/H5TBprivate.h \
+   $(top_srcdir)/src/H5Cpkg.h \
    $(top_srcdir)/src/H5Cprivate.h \
    $(top_srcdir)/src/H5Cpublic.h \
-   $(top_srcdir)/src/H5Fprivate.h
+   $(top_srcdir)/src/H5Fprivate.h \
+   $(top_srcdir)/src/H5SLprivate.h
 cmpd_dset.lo: \
    $(top_srcdir)/test/cmpd_dset.c \
    $(top_srcdir)/src/H5Tpkg.h \
@@ -764,13 +765,13 @@ istore.lo: \
    $(top_srcdir)/src/H5Oprivate.h \
    $(top_srcdir)/src/H5HGprivate.h \
    $(top_srcdir)/src/H5Fprivate.h \
-   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5Tprivate.h \
    $(top_srcdir)/src/H5Gprivate.h \
    $(top_srcdir)/src/H5Bprivate.h \
    $(top_srcdir)/src/H5ACprivate.h \
    $(top_srcdir)/src/H5Cprivate.h \
    $(top_srcdir)/src/H5Cpublic.h \
+   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5RSprivate.h \
    $(top_srcdir)/src/H5Rprivate.h \
    $(top_srcdir)/src/H5Zprivate.h \
@@ -779,7 +780,7 @@ istore.lo: \
    $(top_srcdir)/src/H5Pprivate.h \
    $(top_srcdir)/src/H5Fpkg.h \
    $(top_srcdir)/src/H5FOprivate.h \
-   $(top_srcdir)/src/H5TBprivate.h \
+   $(top_srcdir)/src/H5SLprivate.h \
    $(top_srcdir)/src/H5Vprivate.h
 lheap.lo: \
    $(top_srcdir)/test/lheap.c \
@@ -1004,13 +1005,13 @@ ohdr.lo: \
    $(top_srcdir)/src/H5Oprivate.h \
    $(top_srcdir)/src/H5HGprivate.h \
    $(top_srcdir)/src/H5Fprivate.h \
-   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5Tprivate.h \
    $(top_srcdir)/src/H5Gprivate.h \
    $(top_srcdir)/src/H5Bprivate.h \
    $(top_srcdir)/src/H5ACprivate.h \
    $(top_srcdir)/src/H5Cprivate.h \
    $(top_srcdir)/src/H5Cpublic.h \
+   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5RSprivate.h \
    $(top_srcdir)/src/H5Rprivate.h \
    $(top_srcdir)/src/H5Zprivate.h \
@@ -1395,19 +1396,19 @@ tgenprop.lo: \
    $(top_srcdir)/src/H5Oprivate.h \
    $(top_srcdir)/src/H5HGprivate.h \
    $(top_srcdir)/src/H5Fprivate.h \
-   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5Tprivate.h \
    $(top_srcdir)/src/H5Gprivate.h \
    $(top_srcdir)/src/H5Bprivate.h \
    $(top_srcdir)/src/H5ACprivate.h \
    $(top_srcdir)/src/H5Cprivate.h \
    $(top_srcdir)/src/H5Cpublic.h \
+   $(top_srcdir)/src/H5RCprivate.h \
    $(top_srcdir)/src/H5RSprivate.h \
    $(top_srcdir)/src/H5Rprivate.h \
    $(top_srcdir)/src/H5Zprivate.h \
    $(top_srcdir)/src/H5Ppkg.h \
    $(top_srcdir)/src/H5Pprivate.h \
-   $(top_srcdir)/src/H5TBprivate.h
+   $(top_srcdir)/src/H5SLprivate.h
 th5s.lo: \
    $(top_srcdir)/test/th5s.c \
    $(top_srcdir)/test/testhdf5.h \
@@ -1516,8 +1517,8 @@ theap.lo: \
    $(top_srcdir)/src/H5FDstdio.h \
    $(top_srcdir)/src/H5FDstream.h \
    $(top_srcdir)/src/H5HPprivate.h
-titerate.lo: \
-   $(top_srcdir)/test/titerate.c \
+tid.lo: \
+   $(top_srcdir)/test/tid.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1560,9 +1561,11 @@ titerate.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h
-tmeta.lo: \
-   $(top_srcdir)/test/tmeta.c \
+   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/src/H5Ipkg.h \
+   $(top_srcdir)/src/H5Iprivate.h
+titerate.lo: \
+   $(top_srcdir)/test/titerate.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1605,10 +1608,9 @@ tmeta.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5Fprivate.h
-trefer.lo: \
-   $(top_srcdir)/test/trefer.c \
+   $(top_srcdir)/src/H5FDstream.h
+tmeta.lo: \
+   $(top_srcdir)/test/tmeta.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1651,26 +1653,21 @@ trefer.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h
-trefstr.lo: \
-   $(top_srcdir)/test/trefstr.c \
-   $(top_srcdir)/test/testhdf5.h \
-   $(top_srcdir)/src/H5private.h \
+   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/src/H5Fprivate.h
+tmisc.lo: \
+   $(top_srcdir)/test/tmisc.c \
+   $(top_srcdir)/src/hdf5.h \
    $(top_srcdir)/src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
    $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5MPprivate.h \
-   $(top_srcdir)/src/H5FSprivate.h \
-   $(top_srcdir)/src/H5Eprivate.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Epubgen.h \
-   $(top_srcdir)/test/h5test.h \
-   $(top_srcdir)/src/hdf5.h \
    $(top_srcdir)/src/H5Apublic.h \
+   $(top_srcdir)/src/H5Ipublic.h \
    $(top_srcdir)/src/H5ACpublic.h \
    $(top_srcdir)/src/H5Bpublic.h \
    $(top_srcdir)/src/H5Dpublic.h \
+   $(top_srcdir)/src/H5Epublic.h \
+   $(top_srcdir)/src/H5Epubgen.h \
    $(top_srcdir)/src/H5Fpublic.h \
    $(top_srcdir)/src/H5FDpublic.h \
    $(top_srcdir)/src/H5FPpublic.h \
@@ -1697,10 +1694,32 @@ trefstr.lo: \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
    $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FLprivate.h \
-   $(top_srcdir)/src/H5RSprivate.h
-tselect.lo: \
-   $(top_srcdir)/test/tselect.c \
+   $(top_srcdir)/test/testhdf5.h \
+   $(top_srcdir)/src/H5private.h \
+   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/src/H5FSprivate.h \
+   $(top_srcdir)/src/H5Eprivate.h \
+   $(top_srcdir)/test/h5test.h \
+   $(top_srcdir)/src/H5Dpkg.h \
+   $(top_srcdir)/src/H5Dprivate.h \
+   $(top_srcdir)/src/H5FDprivate.h \
+   $(top_srcdir)/src/H5Oprivate.h \
+   $(top_srcdir)/src/H5HGprivate.h \
+   $(top_srcdir)/src/H5Fprivate.h \
+   $(top_srcdir)/src/H5Tprivate.h \
+   $(top_srcdir)/src/H5Gprivate.h \
+   $(top_srcdir)/src/H5Bprivate.h \
+   $(top_srcdir)/src/H5ACprivate.h \
+   $(top_srcdir)/src/H5Cprivate.h \
+   $(top_srcdir)/src/H5Cpublic.h \
+   $(top_srcdir)/src/H5RCprivate.h \
+   $(top_srcdir)/src/H5RSprivate.h \
+   $(top_srcdir)/src/H5Rprivate.h \
+   $(top_srcdir)/src/H5Zprivate.h \
+   $(top_srcdir)/src/H5Sprivate.h \
+   $(top_srcdir)/src/H5Pprivate.h
+trefer.lo: \
+   $(top_srcdir)/test/trefer.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1743,27 +1762,9 @@ tselect.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5Spkg.h \
-   $(top_srcdir)/src/H5Sprivate.h \
-   $(top_srcdir)/src/H5Dprivate.h \
-   $(top_srcdir)/src/H5FDprivate.h \
-   $(top_srcdir)/src/H5Oprivate.h \
-   $(top_srcdir)/src/H5HGprivate.h \
-   $(top_srcdir)/src/H5Fprivate.h \
-   $(top_srcdir)/src/H5RCprivate.h \
-   $(top_srcdir)/src/H5Tprivate.h \
-   $(top_srcdir)/src/H5Gprivate.h \
-   $(top_srcdir)/src/H5Bprivate.h \
-   $(top_srcdir)/src/H5ACprivate.h \
-   $(top_srcdir)/src/H5Cprivate.h \
-   $(top_srcdir)/src/H5Cpublic.h \
-   $(top_srcdir)/src/H5RSprivate.h \
-   $(top_srcdir)/src/H5Rprivate.h \
-   $(top_srcdir)/src/H5Zprivate.h \
-   $(top_srcdir)/src/H5Pprivate.h
-ttime.lo: \
-   $(top_srcdir)/test/ttime.c \
+   $(top_srcdir)/src/H5FDstream.h
+trefstr.lo: \
+   $(top_srcdir)/test/trefstr.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1806,9 +1807,11 @@ ttime.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h
-ttbbt.lo: \
-   $(top_srcdir)/test/ttbbt.c \
+   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/src/H5FLprivate.h \
+   $(top_srcdir)/src/H5RSprivate.h
+tselect.lo: \
+   $(top_srcdir)/test/tselect.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1852,9 +1855,26 @@ ttbbt.lo: \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
    $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5TBprivate.h
-ttst.lo: \
-   $(top_srcdir)/test/ttst.c \
+   $(top_srcdir)/src/H5Spkg.h \
+   $(top_srcdir)/src/H5Sprivate.h \
+   $(top_srcdir)/src/H5Dprivate.h \
+   $(top_srcdir)/src/H5FDprivate.h \
+   $(top_srcdir)/src/H5Oprivate.h \
+   $(top_srcdir)/src/H5HGprivate.h \
+   $(top_srcdir)/src/H5Fprivate.h \
+   $(top_srcdir)/src/H5Tprivate.h \
+   $(top_srcdir)/src/H5Gprivate.h \
+   $(top_srcdir)/src/H5Bprivate.h \
+   $(top_srcdir)/src/H5ACprivate.h \
+   $(top_srcdir)/src/H5Cprivate.h \
+   $(top_srcdir)/src/H5Cpublic.h \
+   $(top_srcdir)/src/H5RCprivate.h \
+   $(top_srcdir)/src/H5RSprivate.h \
+   $(top_srcdir)/src/H5Rprivate.h \
+   $(top_srcdir)/src/H5Zprivate.h \
+   $(top_srcdir)/src/H5Pprivate.h
+tskiplist.lo: \
+   $(top_srcdir)/test/tskiplist.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1898,9 +1918,9 @@ ttst.lo: \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
    $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5STprivate.h
-tvltypes.lo: \
-   $(top_srcdir)/test/tvltypes.c \
+   $(top_srcdir)/src/H5SLprivate.h
+ttime.lo: \
+   $(top_srcdir)/test/ttime.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1944,8 +1964,8 @@ tvltypes.lo: \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
    $(top_srcdir)/src/H5FDstream.h
-tvlstr.lo: \
-   $(top_srcdir)/test/tvlstr.c \
+ttst.lo: \
+   $(top_srcdir)/test/ttst.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -1988,20 +2008,27 @@ tvlstr.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h
-tmisc.lo: \
-   $(top_srcdir)/test/tmisc.c \
-   $(top_srcdir)/src/hdf5.h \
+   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/src/H5STprivate.h
+tvltypes.lo: \
+   $(top_srcdir)/test/tvltypes.c \
+   $(top_srcdir)/test/testhdf5.h \
+   $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
    $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
+   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/src/H5FSprivate.h \
+   $(top_srcdir)/src/H5Eprivate.h \
+   $(top_srcdir)/src/H5Epublic.h \
    $(top_srcdir)/src/H5Ipublic.h \
+   $(top_srcdir)/src/H5Epubgen.h \
+   $(top_srcdir)/test/h5test.h \
+   $(top_srcdir)/src/hdf5.h \
+   $(top_srcdir)/src/H5Apublic.h \
    $(top_srcdir)/src/H5ACpublic.h \
    $(top_srcdir)/src/H5Bpublic.h \
    $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Epubgen.h \
    $(top_srcdir)/src/H5Fpublic.h \
    $(top_srcdir)/src/H5FDpublic.h \
    $(top_srcdir)/src/H5FPpublic.h \
@@ -2027,33 +2054,9 @@ tmisc.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/test/testhdf5.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
-   $(top_srcdir)/src/H5FSprivate.h \
-   $(top_srcdir)/src/H5Eprivate.h \
-   $(top_srcdir)/test/h5test.h \
-   $(top_srcdir)/src/H5Dpkg.h \
-   $(top_srcdir)/src/H5Dprivate.h \
-   $(top_srcdir)/src/H5FDprivate.h \
-   $(top_srcdir)/src/H5Oprivate.h \
-   $(top_srcdir)/src/H5HGprivate.h \
-   $(top_srcdir)/src/H5Fprivate.h \
-   $(top_srcdir)/src/H5RCprivate.h \
-   $(top_srcdir)/src/H5Tprivate.h \
-   $(top_srcdir)/src/H5Gprivate.h \
-   $(top_srcdir)/src/H5Bprivate.h \
-   $(top_srcdir)/src/H5ACprivate.h \
-   $(top_srcdir)/src/H5Cprivate.h \
-   $(top_srcdir)/src/H5Cpublic.h \
-   $(top_srcdir)/src/H5RSprivate.h \
-   $(top_srcdir)/src/H5Rprivate.h \
-   $(top_srcdir)/src/H5Zprivate.h \
-   $(top_srcdir)/src/H5Sprivate.h \
-   $(top_srcdir)/src/H5Pprivate.h
-tid.lo: \
-   $(top_srcdir)/test/tid.c \
+   $(top_srcdir)/src/H5FDstream.h
+tvlstr.lo: \
+   $(top_srcdir)/test/tvlstr.c \
    $(top_srcdir)/test/testhdf5.h \
    $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
@@ -2096,9 +2099,7 @@ tid.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5Ipkg.h \
-   $(top_srcdir)/src/H5Iprivate.h
+   $(top_srcdir)/src/H5FDstream.h
 unlink.lo: \
    $(top_srcdir)/test/unlink.c \
    $(top_srcdir)/test/h5test.h \
@@ -3058,17 +3059,23 @@ dtransform.lo: \
    $(top_srcdir)/src/H5FSprivate.h
 filename.lo: \
    $(top_srcdir)/test/filename.c \
-   $(top_srcdir)/src/hdf5.h \
+   $(top_srcdir)/test/testhdf5.h \
+   $(top_srcdir)/src/H5private.h \
    $(top_srcdir)/src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
    $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
+   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/src/H5FSprivate.h \
+   $(top_srcdir)/src/H5Eprivate.h \
+   $(top_srcdir)/src/H5Epublic.h \
    $(top_srcdir)/src/H5Ipublic.h \
+   $(top_srcdir)/src/H5Epubgen.h \
+   $(top_srcdir)/test/h5test.h \
+   $(top_srcdir)/src/hdf5.h \
+   $(top_srcdir)/src/H5Apublic.h \
    $(top_srcdir)/src/H5ACpublic.h \
    $(top_srcdir)/src/H5Bpublic.h \
    $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Epubgen.h \
    $(top_srcdir)/src/H5Fpublic.h \
    $(top_srcdir)/src/H5FDpublic.h \
    $(top_srcdir)/src/H5FPpublic.h \
@@ -3094,13 +3101,7 @@ filename.lo: \
    $(top_srcdir)/src/H5FDsec2.h \
    $(top_srcdir)/src/H5FDsrb.h \
    $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/test/h5test.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
-   $(top_srcdir)/src/H5FSprivate.h \
-   $(top_srcdir)/test/testhdf5.h \
-   $(top_srcdir)/src/H5Eprivate.h
+   $(top_srcdir)/src/H5FDstream.h
 reserved.lo: \
    $(top_srcdir)/test/reserved.c \
    $(top_srcdir)/test/h5test.h \
diff --git a/test/Makefile.in b/test/Makefile.in
index bf3a3d4..fc52f78 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -84,7 +84,7 @@ TEST_SRC=big.c bittests.c cache.c cmpd_dset.c dsets.c dtypes.c extend.c      \
     istore.c lheap.c links.c mount.c mtime.c ohdr.c stab.c tarray.c          \
     tattr.c tconfig.c testhdf5.c testmeta.c tfile.c                          \
     tgenprop.c th5s.c theap.c tid.c titerate.c tmeta.c tmisc.c trefer.c      \
-    trefstr.c tselect.c tskiplist.c ttime.c ttbbt.c ttst.c tvltypes.c        \
+    trefstr.c tselect.c tskiplist.c ttime.c ttst.c tvltypes.c                \
     tvlstr.c unlink.c enum.c ttsafe.c ttsafe_dcreate.c ttsafe_error.c        \
     ttsafe_cancel.c ttsafe_acreate.c gass_write.c gass_read.c                \
     gass_append.c srb_read.c srb_write.c srb_append.c stream_test.c          \
@@ -117,7 +117,7 @@ $(PROGS): $(LIB) $(LIBHDF5)
 
 TESTHDF5_OBJ=testhdf5.lo tarray.lo tattr.lo tconfig.lo tfile.lo tgenprop.lo \
     th5s.lo theap.lo tid.lo titerate.lo tmeta.lo tmisc.lo trefer.lo trefstr.lo \
-    tselect.lo tskiplist.lo ttbbt.lo ttime.lo ttst.lo tvltypes.lo tvlstr.lo
+    tselect.lo tskiplist.lo ttime.lo ttst.lo tvltypes.lo tvlstr.lo
 
 TTS_OBJ=ttsafe.lo ttsafe_dcreate.lo ttsafe_error.lo             \
     ttsafe_cancel.lo ttsafe_acreate.lo
diff --git a/test/testhdf5.c b/test/testhdf5.c
index 9d86032..05149aa 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -45,7 +45,6 @@ main(int argc, char *argv[])
     /* Tests are generally arranged from least to most complexity... */
     AddTest("config", test_configure, cleanup_configure, "Configure definitions", NULL);
     AddTest("metadata", test_metadata, cleanup_metadata, "Encode/decode metadata code", NULL);
-    AddTest("tbbt", test_tbbt, NULL,  "Threaded, Balanced, Binary Trees", NULL);
     AddTest("tst", test_tst, NULL,  "Ternary Search Trees", NULL);
     AddTest("heap", test_heap, NULL,  "Memory Heaps", NULL);
     AddTest("skiplist", test_skiplist, NULL,  "Skip Lists", NULL);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 61674a8..c32782a 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -110,7 +110,6 @@ extern "C" {
 
 /* Prototypes for the test routines */
 void                    test_metadata(void);
-void                    test_tbbt(void);
 void                    test_tst(void);
 void                    test_heap(void);
 void                    test_refstr(void);
diff --git a/test/ttbbt.c b/test/ttbbt.c
deleted file mode 100644
index fa34c84..0000000
--- a/test/ttbbt.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
-   FILE
-       tbbt.c
-   Test HDF Threaded-Balanced-Binary Tree (tbbt) routines.
-
-   REMARKS
-
-   DESIGN
-
-   BUGS/LIMITATIONS
-
-   EXPORTED ROUTINES
-
-   AUTHOR
-       Quincey Koziol
-
-   MODIFICATION HISTORY
-       4/22/00 - Converted from HDF4 test routine.
- */
-
-#include <time.h>
-
-#include "testhdf5.h"
-#include "H5TBprivate.h"
-
-#define MAX_TEST_SIZE 31    /* maximum number of elements to insert */
-#define NUM_TEST_RUNS 100   /* number of times to insert & remove each size */
-
-#define RandInt(a,b) ((rand()%(((b)-(a))+1))+(a))
-
-int tcompare (const void * k1, const void * k2, int cmparg);
-
-static void swap_arr(int *arr, int a, int b)
-{
-    int       t;
-
-    if (a != b)
-      {
-          t = arr[a];
-          arr[a] = arr[b];
-          arr[b] = t;
-      }     /* end if */
-}   /* end swap_arr() */
-
-int
-tcompare(const void * k1, const void * k2, int cmparg)
-{
-    /* shut compiler up */
-    cmparg=cmparg;
-    return ((int) ((*(const int *) k1) - (*(const int *) k2)));
-}
-
-void
-test_tbbt(void)
-{
-    int        test_size;
-    int        i, j;
-    int       ins_arr[MAX_TEST_SIZE];
-    int       rem_arr[MAX_TEST_SIZE];
-    int        t;
-    H5TB_TREE  *tree;
-    void *      *r;
-
-    t = (int)time(NULL);
-    srand((unsigned)t);
-
-    for (test_size = 3; test_size <= MAX_TEST_SIZE; test_size++)
-      {
-          MESSAGE(7, ("\nTesting trees with %d elements\n", test_size));
-          MESSAGE(8, ("Testing tree #:"));
-          for (j = 0; j < NUM_TEST_RUNS; j++)
-            {
-                MESSAGE(8, (" %d", j));
-                for (i = 0; i < test_size; i++)
-                  {     /* initialize the arrays */
-                      ins_arr[i] = i;
-                      rem_arr[i] = i;
-                  }     /* end for */
-                for (i = 0; i < test_size; i++)
-                  {     /* shuffle the arrays */
-                      t = RandInt(i, test_size - 1);
-                      swap_arr(ins_arr, i, t);
-                      t = RandInt(i, test_size - 1);
-                      swap_arr(rem_arr, i, t);
-                  }     /* end for */
-
-                if (GetTestVerbosity() >= VERBO_HI)
-                  {
-                      printf("ins_arr: \n");
-                      for (i = 0; i < test_size; i++)   /* print the arrays */
-                          printf("%d \n", (int) ins_arr[i]);
-                      printf("\nrem_arr: \n");
-                      for (i = 0; i < test_size; i++)   /* print the arrays */
-                          printf("%d \n", (int) rem_arr[i]);
-                      printf("\n");
-                  }     /* end if */
-
-                tree = H5TB_dmake(tcompare, sizeof(int),0);
-                for (i = 0; i < test_size; i++)
-                  {
-                      MESSAGE(9, ("inserting %d\n", (int) ins_arr[i]));
-                      H5TB_dins(tree, (void *) &ins_arr[i], NULL);
-#ifdef H5TB_DEBUG
-                      if(GetTestVerbosity() >= VERBO_HI)
-                          H5TB_dump(tree, -1);
-#endif /* H5TB_DEBUG */
-                  }
-#ifdef H5TB_DEBUG
-                if(GetTestVerbosity() >= VERBO_HI)
-                    H5TB_dump(tree, -1);
-#endif /* H5TB_DEBUG */
-                for (i = 0; i < test_size; i++)
-                  {
-                      int       key;
-
-                      key = rem_arr[i];
-                      r = (void * *) H5TB_dfind(tree, (void *) &key, NULL);
-                      MESSAGE(9, ("removing %d\n", (int) key));
-                      H5TB_rem((H5TB_NODE **) tree, (H5TB_NODE *) r, NULL);
-#ifdef H5TB_DEBUG
-                      if(GetTestVerbosity() >= VERBO_HI)
-                          H5TB_dump(tree, -1);
-#endif /* H5TB_DEBUG */
-                  } /* end for */
-                H5TB_dfree(tree, NULL, NULL);
-            }   /* end for */
-      }     /* end for */
-}   /* end test_tbbt() */
-