[multiple changes]

2001-03-31  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.target: Remove duplicate aix entry.

2001-03-30  Benjamin Kosnik  <bkoz@redhat.com>

	* include/ext/stl_bvector.h: Move to...
	* include/bits/stl_vector.h: ...here.
	* include/ext/bvector: Move to...
	* include/backward/bvector.h: ...here.
	* include/bits/std_vector.h: Change stl_bvector include.
	* include/bits/std_queue.h: Remove bvector include.
	* include/ext/tree: Insert using rb_tree, move to...
	* include/backward/tree.h: ...here.
	* include/backward/hash_map.h: Include ext/hash_map.
	* include/backward/hash_set.h: Include ext/hash_set.
	* include/backward/queue.h: New file.
	* include/backward/stack.h: Edit.
	* include/backward/algo.h: Same.
	* include/backward/algobase.h: Same.
	* include/backward/alloc.h: Same.
	* include/backward/function.h: Same.
	* include/backward/iomanip.h: Same.
	* include/backward/istream.h: Same.
	* include/backward/iterator.h: Same.
	* include/backward/list.h: Same.
	* include/backward/map.h: Same.
	* include/backward/multimap.h: Same.
	* include/backward/multiset.h: Same.
	* include/backward/ostream.h: Same.
	* include/backward/pair.h: Same
	* include/backward/rope.h: Same.
	* include/backward/set.h: Same.
	* include/backward/stream.h: Same.
	* include/backward/strstream.h: Same.
	* include/backward/tempbuf.h: Same.
	* src/Makefile.am (ext_headers): Edit.
	* src/Makefile.in: Regenerate.
	* testsuite/ext/headers.cc (main): Fix.
	* mkcheck.in: Fix.

From-SVN: r40979

35 files changed, 131 insertions, 185 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index db4b21f..395ef5b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,44 @@
+2001-03-31  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.target: Remove duplicate aix entry.
+
+2001-03-30  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/ext/stl_bvector.h: Move to...
+	* include/bits/stl_vector.h: ...here.
+	* include/ext/bvector: Move to...
+	* include/backward/bvector.h: ...here.
+	* include/bits/std_vector.h: Change stl_bvector include.
+	* include/bits/std_queue.h: Remove bvector include.
+	* include/ext/tree: Insert using rb_tree, move to...
+	* include/backward/tree.h: ...here.
+	* include/backward/hash_map.h: Include ext/hash_map.
+	* include/backward/hash_set.h: Include ext/hash_set.
+	* include/backward/queue.h: New file.
+	* include/backward/stack.h: Edit.
+	* include/backward/algo.h: Same.
+	* include/backward/algobase.h: Same.
+	* include/backward/alloc.h: Same.
+	* include/backward/function.h: Same.
+	* include/backward/iomanip.h: Same.
+	* include/backward/istream.h: Same.
+	* include/backward/iterator.h: Same.
+	* include/backward/list.h: Same.
+	* include/backward/map.h: Same.
+	* include/backward/multimap.h: Same.
+	* include/backward/multiset.h: Same.
+	* include/backward/ostream.h: Same.
+	* include/backward/pair.h: Same
+	* include/backward/rope.h: Same.
+	* include/backward/set.h: Same.
+	* include/backward/stream.h: Same.
+	* include/backward/strstream.h: Same.
+	* include/backward/tempbuf.h: Same.
+	* src/Makefile.am (ext_headers): Edit.
+	* src/Makefile.in: Regenerate.
+	* testsuite/ext/headers.cc (main): Fix.
+	* mkcheck.in: Fix.
+	
 2001-03-30  Phil Edwards  <pme@sources.redhat.com>
 
 	* tests_flags.in (LIBS):  Pass correct path for installed testing.
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 1da593f..0fda72d 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -69,9 +69,6 @@ case "${target_os}" in
         ;;
     esac
     ;;
-  aix*)
-    os_include_dir="config/os/aix"
-    ;;
   bsd* | freebsd* )
     os_include_dir="config/os/bsd/freebsd"
     ;;
diff --git a/libstdc++-v3/include/backward/algo.h b/libstdc++-v3/include/backward/algo.h
index f93a803..f580dcf 100644
--- a/libstdc++-v3/include/backward/algo.h
+++ b/libstdc++-v3/include/backward/algo.h
@@ -29,6 +29,7 @@
 
 #include "algobase.h"
 #include "tempbuf.h"
+#include "iterator.h"
 #include <bits/stl_algo.h>
 #include <bits/stl_numeric.h>
 
diff --git a/libstdc++-v3/include/backward/algobase.h b/libstdc++-v3/include/backward/algobase.h
index 88e857e..b918955 100644
--- a/libstdc++-v3/include/backward/algobase.h
+++ b/libstdc++-v3/include/backward/algobase.h
@@ -26,18 +26,10 @@
 #ifndef _CPP_BACKWARD_ALGOBASE_H
 #define _CPP_BACKWARD_ALGOBASE_H 1
 
-#ifndef _CPP_BACKWARD_PAIR_H
 #include "pair.h"
-#endif
-#ifndef _CPP_BACKWARD_ITERATOR_H
 #include "iterator.h"
-#endif
-#ifndef _CPP_BITS_STL__ALGOBASE_H
 #include <bits/stl_algobase.h>
-#endif
-#ifndef _CPP_BITS_STL_UNINITIALIZED_H
 #include <bits/stl_uninitialized.h>
-#endif
 
 // Names from stl_algobase.h
 using std::iter_swap; 
diff --git a/libstdc++-v3/include/backward/alloc.h b/libstdc++-v3/include/backward/alloc.h
index a90f41f..3997d14 100644
--- a/libstdc++-v3/include/backward/alloc.h
+++ b/libstdc++-v3/include/backward/alloc.h
@@ -15,9 +15,7 @@
 #define _CPP_BACKWARD_ALLOC_H 1
 
 #include <bits/c++config.h>
-#ifndef _CPP_BITS_STL_ALLOC_H
 #include <bits/stl_alloc.h>
-#endif
 
 using std::__malloc_alloc_template; 
 using std::malloc_alloc; 
diff --git a/libstdc++-v3/include/backward/bvector.h b/libstdc++-v3/include/backward/bvector.h
index 0c08cd6..48a713f 100644
--- a/libstdc++-v3/include/backward/bvector.h
+++ b/libstdc++-v3/include/backward/bvector.h
@@ -24,16 +24,15 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_BVECTOR_H
-#define _CPP_BACKWARD_BVECTOR_H 1
+#ifndef __SGI_STL_BVECTOR_H
+#define __SGI_STL_BVECTOR_H
 
-#include "vector.h"
 
-#include <ext/stl_bvector.h>
+#include <bits/std_vector.h>
 
 using std::bit_vector;
 
-#endif /* _CPP_BACKWARD_BVECTOR_H */
+#endif /* __SGI_STL_BVECTOR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/function.h b/libstdc++-v3/include/backward/function.h
index d4f4489..747135e 100644
--- a/libstdc++-v3/include/backward/function.h
+++ b/libstdc++-v3/include/backward/function.h
@@ -29,9 +29,7 @@
 
 #include <bits/c++config.h>
 #include <stddef.h>
-#ifndef _CPP_BITS_STL_FUNCTION_H
 #include <bits/stl_function.h>
-#endif
 
 // Names from stl_function.h
 using std::unary_function; 
diff --git a/libstdc++-v3/include/backward/hash_map.h b/libstdc++-v3/include/backward/hash_map.h
index 29ba8d5..fd8d823 100644
--- a/libstdc++-v3/include/backward/hash_map.h
+++ b/libstdc++-v3/include/backward/hash_map.h
@@ -27,12 +27,8 @@
 #ifndef _CPP_BACKWARD_HASH_MAP_H
 #define _CPP_BACKWARD_HASH_MAP_H 1
 
-#ifndef _CPP_BITS_STL_HASHTABLE_H
-#include <bits/stl_hashtable.h>
-#endif 
-
 #include "algobase.h"
-#include <bits/stl_hash_map.h>
+#include <ext/hash_map>
 
 using std::hash;
 using std::hashtable;
diff --git a/libstdc++-v3/include/backward/hash_set.h b/libstdc++-v3/include/backward/hash_set.h
index 728d7c0..9458910 100644
--- a/libstdc++-v3/include/backward/hash_set.h
+++ b/libstdc++-v3/include/backward/hash_set.h
@@ -27,12 +27,8 @@
 #ifndef _CPP_BACKWARD_HASH_SET_H
 #define _CPP_BACKWARD_HASH_SET_H 1
 
-#ifndef _CPP_BITS_STL_HASHTABLE_H
-#include <bits/stl_hashtable.h>
-#endif 
-
 #include "algobase.h"
-#include <bits/stl_hash_set.h>
+#include <ext/hash_set>
 
 using std::hash;
 using std::hashtable;
@@ -40,3 +36,4 @@ using std::hash_set;
 using std::hash_multiset;
 
 #endif /* _CPP_BACKWARD_HASH_SET_H */
+
diff --git a/libstdc++-v3/include/backward/iomanip.h b/libstdc++-v3/include/backward/iomanip.h
index 3f99045..10cd3ba 100644
--- a/libstdc++-v3/include/backward/iomanip.h
+++ b/libstdc++-v3/include/backward/iomanip.h
@@ -28,7 +28,7 @@
 #ifndef _CPP_BACKWARD_IOMANIP_H
 #define _CPP_BACKWARD_IOMANIP_H 1
 
-#include <iostream.h>
+#include "iostream.h"
 #include <bits/std_iomanip.h>
 
 // These are from <ios> as per [27.4].
diff --git a/libstdc++-v3/include/backward/istream.h b/libstdc++-v3/include/backward/istream.h
index 57ea07e..4534479 100644
--- a/libstdc++-v3/include/backward/istream.h
+++ b/libstdc++-v3/include/backward/istream.h
@@ -28,7 +28,7 @@
 #ifndef _CPP_BACKWARD_ISTREAM_H
 #define _CPP_BACKWARD_ISTREAM_H 1
 
-#include <iostream.h>
+#include "iostream.h"
 
 #endif
 
diff --git a/libstdc++-v3/include/backward/iterator.h b/libstdc++-v3/include/backward/iterator.h
index e2b6ef5..d285160 100644
--- a/libstdc++-v3/include/backward/iterator.h
+++ b/libstdc++-v3/include/backward/iterator.h
@@ -27,26 +27,15 @@
 #ifndef _CPP_BACKWARD_ITERATOR_H
 #define _CPP_BACKWARD_ITERATOR_H 1
 
-#ifndef _CPP_BACKWARD_FUNCTION_H
 #include "function.h"
-#endif
 #include <stddef.h>
 #include "iostream.h"
-#ifndef _CPP_BITS_STL_ITERATOR_H
-#include <bits/stl_iterator.h>
-#endif
-#ifndef _CPP_BITS_TYPE_TRAITS_H
-#include <bits/type_traits.h>
-#endif
-#ifndef _CPP_BITS_STL_CONSTRUCT_H
+#include "iterator.h"
+
 #include <bits/stl_construct.h>
-#endif
-#ifndef _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H
 #include <bits/stl_raw_storage_iter.h>
-#endif
 
 // Names from stl_iterator.h
-
 using std::input_iterator_tag;
 using std::output_iterator_tag;
 using std::forward_iterator_tag;
diff --git a/libstdc++-v3/include/backward/list.h b/libstdc++-v3/include/backward/list.h
index 22b5e7a..5870ee0 100644
--- a/libstdc++-v3/include/backward/list.h
+++ b/libstdc++-v3/include/backward/list.h
@@ -27,7 +27,7 @@
 #ifndef _CPP_BACKWARD_LIST_H
 #define _CPP_BACKWARD_LIST_H 1
 
-#include <bits/stl_algobase.h>
+#include "algobase.h"
 #include "alloc.h"
 #include <bits/std_list.h>
 
diff --git a/libstdc++-v3/include/backward/map.h b/libstdc++-v3/include/backward/map.h
index e38a307..e9058c18 100644
--- a/libstdc++-v3/include/backward/map.h
+++ b/libstdc++-v3/include/backward/map.h
@@ -28,7 +28,7 @@
 #define _CPP_BACKWARD_MAP_H 1
 
 #include "tree.h"
-#include <bits/stl_map.h>
+#include <bits/std_map.h>
 
 using std::map;
 
diff --git a/libstdc++-v3/include/backward/multimap.h b/libstdc++-v3/include/backward/multimap.h
index b6bfec2..04db006 100644
--- a/libstdc++-v3/include/backward/multimap.h
+++ b/libstdc++-v3/include/backward/multimap.h
@@ -28,7 +28,7 @@
 #define _CPP_BACKWARD_MULTIMAP_H 1
 
 #include "tree.h"
-#include <bits/stl_multimap.h>
+#include <bits/std_map.h>
 
 using std::multimap;
 
diff --git a/libstdc++-v3/include/backward/multiset.h b/libstdc++-v3/include/backward/multiset.h
index f5f53ab..d78e6f8 100644
--- a/libstdc++-v3/include/backward/multiset.h
+++ b/libstdc++-v3/include/backward/multiset.h
@@ -28,7 +28,7 @@
 #define _CPP_BACKWARD_MULTISET_H 1
 
 #include "tree.h"
-#include <bits/stl_multiset.h>
+#include <bits/std_set.h>
 
 using std::multiset;
 
diff --git a/libstdc++-v3/include/backward/ostream.h b/libstdc++-v3/include/backward/ostream.h
index 7b48785..53a983c 100644
--- a/libstdc++-v3/include/backward/ostream.h
+++ b/libstdc++-v3/include/backward/ostream.h
@@ -28,7 +28,7 @@
 #ifndef _CPP_BACKWARD_OSTREAM_H
 #define _CPP_BACKWARD_OSTREAM_H 1
 
-#include <iostream.h>
+#include "iostream.h"
 
 #endif 
 
diff --git a/libstdc++-v3/include/backward/pair.h b/libstdc++-v3/include/backward/pair.h
index c8f2fa3..0c69958 100644
--- a/libstdc++-v3/include/backward/pair.h
+++ b/libstdc++-v3/include/backward/pair.h
@@ -28,9 +28,7 @@
 #define _CPP_BACKWARD_PAIR_H 1
 
 #include <bits/c++config.h>
-#ifndef _CPP_BITS_STL_PAIR_H
 #include <bits/stl_pair.h>
-#endif
 
 using std::pair;
 using std::make_pair;
diff --git a/libstdc++-v3/include/backward/queue.h b/libstdc++-v3/include/backward/queue.h
new file mode 100644
index 0000000..f6a4b1b
--- /dev/null
+++ b/libstdc++-v3/include/backward/queue.h
@@ -0,0 +1,40 @@
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#ifndef _CPP_BACKWARD_QUEUE_H
+#define _CPP_BACKWARD_QUEUE_H 1
+
+#include <bits/std_queue.h>
+
+using std::queue;
+using std::priority_queue;
+
+#endif 
+
+// Local Variables:
+// mode:C++
+// End:
diff --git a/libstdc++-v3/include/backward/rope.h b/libstdc++-v3/include/backward/rope.h
index 8bf753d..6dafb16 100644
--- a/libstdc++-v3/include/backward/rope.h
+++ b/libstdc++-v3/include/backward/rope.h
@@ -15,7 +15,7 @@
 #define _CPP_BACKWARD_ROPE_H 1
 
 #include "hashtable.h"   
-#include <ext/stl_rope.h>
+#include <ext/rope>
 
 using std::char_producer; 
 using std::sequence_buffer; 
diff --git a/libstdc++-v3/include/backward/set.h b/libstdc++-v3/include/backward/set.h
index 4fad915..7822bea 100644
--- a/libstdc++-v3/include/backward/set.h
+++ b/libstdc++-v3/include/backward/set.h
@@ -28,7 +28,7 @@
 #define _CPP_BACKWARD_SET_H 1
 
 #include "tree.h"
-#include <bits/stl_set.h>
+#include <bits/std_set.h>
 
 using std::set;
 
diff --git a/libstdc++-v3/include/backward/stack.h b/libstdc++-v3/include/backward/stack.h
index 85387e1..a9a800a 100644
--- a/libstdc++-v3/include/backward/stack.h
+++ b/libstdc++-v3/include/backward/stack.h
@@ -30,12 +30,10 @@
 #include "vector.h"
 #include "deque.h"
 #include "heap.h"
-#include <bits/stl_stack.h>
-#include <bits/stl_queue.h>
+#include "queue.h"
+#include <bits/std_stack.h>
 
 using std::stack;
-using std::queue;
-using std::priority_queue;
 
 #endif /* _CPP_BACKWARD_STACK_H */
 
diff --git a/libstdc++-v3/include/backward/stream.h b/libstdc++-v3/include/backward/stream.h
index 15c32b8..b22d686 100644
--- a/libstdc++-v3/include/backward/stream.h
+++ b/libstdc++-v3/include/backward/stream.h
@@ -28,7 +28,7 @@
 #ifndef _CPP_BACKWARD_STREAM_H
 #define _CPP_BACKWARD_STREAM_H 1
 
-#include <iostream.h>
+#include "iostream.h"
 
 #endif 
 
diff --git a/libstdc++-v3/include/backward/strstream.h b/libstdc++-v3/include/backward/strstream.h
index 3918141..82802d2 100644
--- a/libstdc++-v3/include/backward/strstream.h
+++ b/libstdc++-v3/include/backward/strstream.h
@@ -30,7 +30,7 @@
 #ifndef _CPP_BACKWARD_STRSTREAM_H
 #define _CPP_BACKWARD_STRSTREAM_H 1
 
-#include <strstream>
+#include "strstream"
 
 using std::strstreambuf;
 using std::istrstream;
diff --git a/libstdc++-v3/include/backward/tempbuf.h b/libstdc++-v3/include/backward/tempbuf.h
index b8d36d7..425adf1 100644
--- a/libstdc++-v3/include/backward/tempbuf.h
+++ b/libstdc++-v3/include/backward/tempbuf.h
@@ -27,29 +27,19 @@
 #ifndef _CPP_BACKWARD_TEMPBUF_H
 #define _CPP_BACKWARD_TEMPBUF_H 1
 
-#ifndef _CPP_BACKWARD_PAIR_H
 #include "pair.h"
-#endif
-#include <iterator.h>
+#include "iterator.h"
 #include <limits.h>
 #include <stddef.h> 
 #include <stdlib.h> 
-#ifndef _CPP_BITS_TYPE_TRAITS_H
 #include <bits/type_traits.h>  
-#endif
-#ifndef _CPP_BITS_STL_CONSTRUCT_H
 #include <bits/stl_construct.h>
-#endif
-#ifndef _CPP_BITS_STL_UNINITIALIZED_H
 #include <bits/stl_uninitialized.h>
-#endif
-#ifndef _CPP_BITS_STL_TEMPBUF_H
 #include <bits/stl_tempbuf.h>
-#endif
 
 using std::get_temporary_buffer;
 using std::return_temporary_buffer;
-using std::_Temporary_buffer;
+using std::temporary_buffer;
 
 #endif /* _CPP_BACKWARD_TEMPBUF_H */
 
diff --git a/libstdc++-v3/include/backward/tree.h b/libstdc++-v3/include/backward/tree.h
index bca51de..728544b 100644
--- a/libstdc++-v3/include/backward/tree.h
+++ b/libstdc++-v3/include/backward/tree.h
@@ -1,6 +1,6 @@
+
 /*
- *
- * Copyright (c) 1996,1997
+ * Copyright (c) 1997
  * Silicon Graphics Computer Systems, Inc.
  *
  * Permission to use, copy, modify, distribute and sell this software
@@ -11,34 +11,16 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
  */
 
-#ifndef _CPP_BACKWARD_TREE_H
-#define _CPP_BACKWARD_TREE_H 1
+#ifndef _CPP_EXT_TREE
+#define _CPP_EXT_TREE 1
 
-#ifndef _CPP_BITS_STL_TREE_H
 #include <bits/stl_tree.h>
-#endif
-#include "algobase.h" 
-#include "alloc.h"
 
 using std::rb_tree;
 
-#endif /* _CPP_BACKWARD_TREE_H */
-
+#endif 
 // Local Variables:
 // mode:C++
 // End:
diff --git a/libstdc++-v3/include/bits/std_queue.h b/libstdc++-v3/include/bits/std_queue.h
index e15a3a2..d726479 100644
--- a/libstdc++-v3/include/bits/std_queue.h
+++ b/libstdc++-v3/include/bits/std_queue.h
@@ -34,7 +34,6 @@
 #include <bits/stl_construct.h>
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_vector.h>
-#include <ext/stl_bvector.h>
 #include <bits/stl_heap.h>
 #include <bits/stl_deque.h>
 #include <bits/stl_function.h>
diff --git a/libstdc++-v3/include/bits/std_vector.h b/libstdc++-v3/include/bits/std_vector.h
index 6b846ad..9b5ba58 100644
--- a/libstdc++-v3/include/bits/std_vector.h
+++ b/libstdc++-v3/include/bits/std_vector.h
@@ -35,7 +35,7 @@
 #include <bits/stl_construct.h>
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_vector.h>
-#include <ext/stl_bvector.h> 
+#include <bits/stl_bvector.h> 
 
 #endif /* _CPP_VECTOR */
 
diff --git a/libstdc++-v3/include/ext/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 7b768a4..7b768a4 100644
--- a/libstdc++-v3/include/ext/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
diff --git a/libstdc++-v3/include/ext/bvector b/libstdc++-v3/include/ext/bvector
deleted file mode 100644
index d40fe50..0000000
--- a/libstdc++-v3/include/ext/bvector
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef __SGI_STL_BVECTOR_H
-#define __SGI_STL_BVECTOR_H
-
-
-#include <bits/std_vector.h>
-#include <ext/stl_bvector.h>
-
-using std::bit_vector;
-
-#endif /* __SGI_STL_BVECTOR_H */
-
-// Local Variables:
-// mode:C++
-// End:
-
-
diff --git a/libstdc++-v3/include/ext/tree b/libstdc++-v3/include/ext/tree
deleted file mode 100644
index f6faf97..0000000
--- a/libstdc++-v3/include/ext/tree
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef _CPP_EXT_TREE
-#define _CPP_EXT_TREE 1
-#include <bits/stl_tree.h>
-#endif 
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 72a2b76..0d59d8b 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -320,9 +320,7 @@ test_file()
     # time_t's (no more overhead than grabbing two date(1)'s).
     compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME"
     COMP_TIME_START=$($TIMER_COMMAND)
-    echo $SRC_NAME >> compile.out
     $compiler_invocation >> compile.out 2>&1
-    echo "" >> compile.out
     COMP_TIME_END=$($TIMER_COMMAND)
 
     if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then
@@ -332,7 +330,7 @@ test_file()
     fi
 
     if [ -f $EXENAME ]; then
-#        rm compile.out
+        rm compile.out
         size_command TEXT
         size_command DATA
         size_command SIZE
@@ -370,8 +368,8 @@ test_file()
     else
         # the file did not compile/link.
         printf "\n" >> $LOG_FILE
-#        `cat compile.out >> $LOG_FILE` 
-#        rm compile.out
+        `cat compile.out >> $LOG_FILE` 
+        rm compile.out
         RESULT="-b"
         TEXT="0"
         DATA="0"
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 243b7eb..59ff542 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.78 2001/03/25 00:16:56 pme Exp $
+## $Id: Makefile.am,v 1.79 2001/03/28 01:19:42 aoliva Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -94,7 +94,7 @@ base_headers = \
 	bits/stl_relops.h bits/stl_set.h \
 	bits/stl_stack.h bits/stl_tempbuf.h \
 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
-	bits/type_traits.h bits/std_algorithm.h \
+	bits/stl_bvector.h bits/type_traits.h bits/std_algorithm.h \
 	bits/concept_checks.h bits/container_concepts.h \
 	bits/sequence_concepts.h bits/stl_construct.h
 
@@ -104,18 +104,18 @@ backward_headers = \
 	backward/algo.h backward/algobase.h backward/alloc.h \
 	backward/bvector.h backward/defalloc.h backward/deque.h \
 	backward/function.h backward/hash_map.h backward/hash_set.h \
-	backward/hashtable.h backward/heap.h backward/iterator.h \
-	backward/list.h backward/map.h backward/multimap.h backward/new.h \
-	backward/multiset.h backward/pair.h backward/iostream.h \
-	backward/rope.h backward/set.h backward/slist.h backward/stack.h \
-	backward/tempbuf.h backward/tree.h backward/vector.h \
-	backward/fstream.h backward/strstream.h backward/strstream
+	backward/hashtable.h backward/heap.h backward/iostream.h \
+	backward/iterator.h backward/list.h backward/map.h \
+	backward/multimap.h backward/new.h backward/multiset.h \
+	backward/pair.h backward/queue.h backward/rope.h backward/set.h \
+	backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h \
+	backward/vector.h backward/fstream.h backward/strstream.h \
+	backward/strstream
 
 ext_headers = \
-	ext/ropeimpl.h ext/stl_rope.h \
-	ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h \
-	ext/hash_map ext/hash_set ext/rope ext/slist \
-	ext/tree ext/bvector 
+	ext/rope ext/ropeimpl.h ext/stl_rope.h \
+	ext/slist ext/hash_map ext/hash_set \
+	ext/stl_hashtable.h ext/stl_hash_fun.h 
 
 c_base_headers = \
 	bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index ade7553..4dc4de8 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -140,13 +140,13 @@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 INCLUDES =  	-nostdinc++ 	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include 	$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) 	$(TOPLEVEL_INCLUDES)
 
 
-base_headers =  	bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h 	bits/stringfwd.h bits/std_string.h bits/basic_string.h 	bits/basic_string.tcc 	bits/generic_shadow.h bits/std_utility.h 	bits/std_complex.h 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h 	bits/std_fstream.h bits/std_iomanip.h 	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc 	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h 	bits/std_istream.h bits/istream.tcc bits/std_locale.h 	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc 	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h 	bits/streambuf.tcc bits/basic_file.h 	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h 	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h 	bits/stl_threads.h bits/stl_iterator_base.h 	bits/std_bitset.h bits/std_deque.h bits/std_functional.h 	bits/std_iterator.h bits/std_list.h 	bits/std_map.h bits/std_memory.h bits/std_numeric.h 	bits/std_queue.h bits/std_set.h bits/std_stack.h 	bits/std_stdexcept.h bits/functexcept.h bits/std_vector.h 	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h 	bits/stl_deque.h bits/stl_function.h 	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h 	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h 	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h 	bits/stl_relops.h bits/stl_set.h 	bits/stl_stack.h bits/stl_tempbuf.h 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h 	bits/type_traits.h bits/std_algorithm.h 	bits/concept_checks.h bits/container_concepts.h 	bits/sequence_concepts.h bits/stl_construct.h
+base_headers =  	bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h 	bits/stringfwd.h bits/std_string.h bits/basic_string.h 	bits/basic_string.tcc 	bits/generic_shadow.h bits/std_utility.h 	bits/std_complex.h 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h 	bits/std_fstream.h bits/std_iomanip.h 	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc 	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h 	bits/std_istream.h bits/istream.tcc bits/std_locale.h 	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc 	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h 	bits/streambuf.tcc bits/basic_file.h 	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h 	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h 	bits/stl_threads.h bits/stl_iterator_base.h 	bits/std_bitset.h bits/std_deque.h bits/std_functional.h 	bits/std_iterator.h bits/std_list.h 	bits/std_map.h bits/std_memory.h bits/std_numeric.h 	bits/std_queue.h bits/std_set.h bits/std_stack.h 	bits/std_stdexcept.h bits/functexcept.h bits/std_vector.h 	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h 	bits/stl_deque.h bits/stl_function.h 	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h 	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h 	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h 	bits/stl_relops.h bits/stl_set.h 	bits/stl_stack.h bits/stl_tempbuf.h 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h 	bits/stl_bvector.h bits/type_traits.h bits/std_algorithm.h 	bits/concept_checks.h bits/container_concepts.h 	bits/sequence_concepts.h bits/stl_construct.h
 
 
-backward_headers =  	backward/complex.h backward/iomanip.h backward/istream.h 	backward/ostream.h backward/stream.h backward/streambuf.h 	backward/algo.h backward/algobase.h backward/alloc.h 	backward/bvector.h backward/defalloc.h backward/deque.h 	backward/function.h backward/hash_map.h backward/hash_set.h 	backward/hashtable.h backward/heap.h backward/iterator.h 	backward/list.h backward/map.h backward/multimap.h backward/new.h 	backward/multiset.h backward/pair.h backward/iostream.h 	backward/rope.h backward/set.h backward/slist.h backward/stack.h 	backward/tempbuf.h backward/tree.h backward/vector.h 	backward/fstream.h backward/strstream.h backward/strstream
+backward_headers =  	backward/complex.h backward/iomanip.h backward/istream.h 	backward/ostream.h backward/stream.h backward/streambuf.h 	backward/algo.h backward/algobase.h backward/alloc.h 	backward/bvector.h backward/defalloc.h backward/deque.h 	backward/function.h backward/hash_map.h backward/hash_set.h 	backward/hashtable.h backward/heap.h backward/iostream.h 	backward/iterator.h backward/list.h backward/map.h 	backward/multimap.h backward/new.h backward/multiset.h 	backward/pair.h backward/queue.h backward/rope.h backward/set.h 	backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h 	backward/vector.h backward/fstream.h backward/strstream.h 	backward/strstream
 
 
-ext_headers =  	ext/ropeimpl.h ext/stl_rope.h 	ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h 	ext/hash_map ext/hash_set ext/rope ext/slist 	ext/tree ext/bvector 
+ext_headers =  	ext/rope ext/ropeimpl.h ext/stl_rope.h 	ext/slist ext/hash_map ext/hash_set 	ext/stl_hashtable.h ext/stl_hash_fun.h 
 
 
 c_base_headers =  	bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h 	bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h 	bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h 	bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h 	bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h 	bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
diff --git a/libstdc++-v3/testsuite/ext/headers.cc b/libstdc++-v3/testsuite/ext/headers.cc
index d596bf98..297674d 100644
--- a/libstdc++-v3/testsuite/ext/headers.cc
+++ b/libstdc++-v3/testsuite/ext/headers.cc
@@ -1,6 +1,6 @@
 // 1999-06-23 bkoz 
 
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -23,11 +23,9 @@
 // This should include a list of all headers in the extension
 // subdirectory that are meant to be directly included.
 
-#include <ext/bvector>
 #include <ext/hash_map>
 #include <ext/hash_set>
 #include <ext/rope>
 #include <ext/slist>
-#include <ext/tree>
 
 int main() { }