This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] backward cleanup
- To: gcc-patches at gcc dot gnu dot org
- Subject: [v3] backward cleanup
- From: Benjamin Kosnik <bkoz at redhat dot com>
- Date: Sat, 31 Mar 2001 12:15:09 -0800
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.
Index: configure.target
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.target,v
retrieving revision 1.17
diff -c -p -r1.17 configure.target
*** configure.target 2001/03/07 18:35:46 1.17
--- configure.target 2001/03/31 20:09:10
*************** case "${target_os}" in
*** 69,77 ****
;;
esac
;;
- aix*)
- os_include_dir="config/os/aix"
- ;;
bsd* | freebsd* )
os_include_dir="config/os/bsd/freebsd"
;;
--- 69,74 ----
Index: mkcheck.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/mkcheck.in,v
retrieving revision 1.53
diff -c -p -r1.53 mkcheck.in
*** mkcheck.in 2001/03/30 08:14:14 1.53
--- mkcheck.in 2001/03/31 20:09:11
*************** test_file()
*** 320,328 ****
# 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
--- 320,326 ----
*************** test_file()
*** 332,338 ****
fi
if [ -f $EXENAME ]; then
! # rm compile.out
size_command TEXT
size_command DATA
size_command SIZE
--- 330,336 ----
fi
if [ -f $EXENAME ]; then
! rm compile.out
size_command TEXT
size_command DATA
size_command SIZE
*************** test_file()
*** 370,377 ****
else
# the file did not compile/link.
printf "\n" >> $LOG_FILE
! # `cat compile.out >> $LOG_FILE`
! # rm compile.out
RESULT="-b"
TEXT="0"
DATA="0"
--- 368,375 ----
else
# the file did not compile/link.
printf "\n" >> $LOG_FILE
! `cat compile.out >> $LOG_FILE`
! rm compile.out
RESULT="-b"
TEXT="0"
DATA="0"
Index: include/backward/algo.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/algo.h,v
retrieving revision 1.2
diff -c -p -r1.2 algo.h
*** algo.h 2001/03/04 21:34:00 1.2
--- algo.h 2001/03/31 20:09:13
***************
*** 29,34 ****
--- 29,35 ----
#include "algobase.h"
#include "tempbuf.h"
+ #include "iterator.h"
#include <bits/stl_algo.h>
#include <bits/stl_numeric.h>
Index: include/backward/algobase.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/algobase.h,v
retrieving revision 1.2
diff -c -p -r1.2 algobase.h
*** algobase.h 2001/03/04 21:34:00 1.2
--- algobase.h 2001/03/31 20:09:13
***************
*** 26,43 ****
#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;
--- 26,35 ----
Index: include/backward/alloc.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/alloc.h,v
retrieving revision 1.3
diff -c -p -r1.3 alloc.h
*** alloc.h 2001/03/04 21:34:00 1.3
--- alloc.h 2001/03/31 20:09:13
***************
*** 15,23 ****
#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;
--- 15,21 ----
Index: include/backward/bvector.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/bvector.h,v
retrieving revision 1.3
diff -c -p -r1.3 bvector.h
*** bvector.h 2001/03/12 18:18:34 1.3
--- bvector.h 2001/03/31 20:09:13
***************
*** 24,39 ****
* purpose. It is provided "as is" without express or implied warranty.
*/
! #ifndef _CPP_BACKWARD_BVECTOR_H
! #define _CPP_BACKWARD_BVECTOR_H 1
- #include "vector.h"
! #include <ext/stl_bvector.h>
using std::bit_vector;
! #endif /* _CPP_BACKWARD_BVECTOR_H */
// Local Variables:
// mode:C++
--- 24,38 ----
* 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>
using std::bit_vector;
! #endif /* __SGI_STL_BVECTOR_H */
// Local Variables:
// mode:C++
Index: include/backward/function.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/function.h,v
retrieving revision 1.4
diff -c -p -r1.4 function.h
*** function.h 2001/03/04 21:34:00 1.4
--- function.h 2001/03/31 20:09:13
***************
*** 29,37 ****
#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;
--- 29,35 ----
Index: include/backward/hash_map.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_map.h,v
retrieving revision 1.2
diff -c -p -r1.2 hash_map.h
*** hash_map.h 2001/03/04 21:34:00 1.2
--- hash_map.h 2001/03/31 20:09:13
***************
*** 27,38 ****
#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>
using std::hash;
using std::hashtable;
--- 27,34 ----
#ifndef _CPP_BACKWARD_HASH_MAP_H
#define _CPP_BACKWARD_HASH_MAP_H 1
#include "algobase.h"
! #include <ext/hash_map>
using std::hash;
using std::hashtable;
Index: include/backward/hash_set.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/hash_set.h,v
retrieving revision 1.2
diff -c -p -r1.2 hash_set.h
*** hash_set.h 2001/03/04 21:34:00 1.2
--- hash_set.h 2001/03/31 20:09:13
***************
*** 27,38 ****
#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>
using std::hash;
using std::hashtable;
--- 27,34 ----
#ifndef _CPP_BACKWARD_HASH_SET_H
#define _CPP_BACKWARD_HASH_SET_H 1
#include "algobase.h"
! #include <ext/hash_set>
using std::hash;
using std::hashtable;
*************** using std::hash_set;
*** 40,42 ****
--- 36,39 ----
using std::hash_multiset;
#endif /* _CPP_BACKWARD_HASH_SET_H */
+
Index: include/backward/iomanip.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/iomanip.h,v
retrieving revision 1.4
diff -c -p -r1.4 iomanip.h
*** iomanip.h 2001/02/26 20:33:09 1.4
--- iomanip.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#ifndef _CPP_BACKWARD_IOMANIP_H
#define _CPP_BACKWARD_IOMANIP_H 1
! #include <iostream.h>
#include <bits/std_iomanip.h>
// These are from <ios> as per [27.4].
--- 28,34 ----
#ifndef _CPP_BACKWARD_IOMANIP_H
#define _CPP_BACKWARD_IOMANIP_H 1
! #include "iostream.h"
#include <bits/std_iomanip.h>
// These are from <ios> as per [27.4].
Index: include/backward/istream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/istream.h,v
retrieving revision 1.3
diff -c -p -r1.3 istream.h
*** istream.h 2000/12/23 07:13:57 1.3
--- istream.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#ifndef _CPP_BACKWARD_ISTREAM_H
#define _CPP_BACKWARD_ISTREAM_H 1
! #include <iostream.h>
#endif
--- 28,34 ----
#ifndef _CPP_BACKWARD_ISTREAM_H
#define _CPP_BACKWARD_ISTREAM_H 1
! #include "iostream.h"
#endif
Index: include/backward/iterator.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/iterator.h,v
retrieving revision 1.2
diff -c -p -r1.2 iterator.h
*** iterator.h 2001/03/04 21:34:00 1.2
--- iterator.h 2001/03/31 20:09:14
***************
*** 27,52 ****
#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 <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;
--- 27,41 ----
#ifndef _CPP_BACKWARD_ITERATOR_H
#define _CPP_BACKWARD_ITERATOR_H 1
#include "function.h"
#include <stddef.h>
#include "iostream.h"
! #include "iterator.h"
!
#include <bits/stl_construct.h>
#include <bits/stl_raw_storage_iter.h>
// Names from stl_iterator.h
using std::input_iterator_tag;
using std::output_iterator_tag;
using std::forward_iterator_tag;
Index: include/backward/list.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/list.h,v
retrieving revision 1.2
diff -c -p -r1.2 list.h
*** list.h 2001/03/04 21:34:00 1.2
--- list.h 2001/03/31 20:09:14
***************
*** 27,33 ****
#ifndef _CPP_BACKWARD_LIST_H
#define _CPP_BACKWARD_LIST_H 1
! #include <bits/stl_algobase.h>
#include "alloc.h"
#include <bits/std_list.h>
--- 27,33 ----
#ifndef _CPP_BACKWARD_LIST_H
#define _CPP_BACKWARD_LIST_H 1
! #include "algobase.h"
#include "alloc.h"
#include <bits/std_list.h>
Index: include/backward/map.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/map.h,v
retrieving revision 1.2
diff -c -p -r1.2 map.h
*** map.h 2001/03/04 21:34:00 1.2
--- map.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#define _CPP_BACKWARD_MAP_H 1
#include "tree.h"
! #include <bits/stl_map.h>
using std::map;
--- 28,34 ----
#define _CPP_BACKWARD_MAP_H 1
#include "tree.h"
! #include <bits/std_map.h>
using std::map;
Index: include/backward/multimap.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/multimap.h,v
retrieving revision 1.2
diff -c -p -r1.2 multimap.h
*** multimap.h 2001/03/04 21:34:00 1.2
--- multimap.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#define _CPP_BACKWARD_MULTIMAP_H 1
#include "tree.h"
! #include <bits/stl_multimap.h>
using std::multimap;
--- 28,34 ----
#define _CPP_BACKWARD_MULTIMAP_H 1
#include "tree.h"
! #include <bits/std_map.h>
using std::multimap;
Index: include/backward/multiset.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/multiset.h,v
retrieving revision 1.2
diff -c -p -r1.2 multiset.h
*** multiset.h 2001/03/04 21:34:00 1.2
--- multiset.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#define _CPP_BACKWARD_MULTISET_H 1
#include "tree.h"
! #include <bits/stl_multiset.h>
using std::multiset;
--- 28,34 ----
#define _CPP_BACKWARD_MULTISET_H 1
#include "tree.h"
! #include <bits/std_set.h>
using std::multiset;
Index: include/backward/ostream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/ostream.h,v
retrieving revision 1.3
diff -c -p -r1.3 ostream.h
*** ostream.h 2000/12/23 07:13:57 1.3
--- ostream.h 2001/03/31 20:09:14
***************
*** 28,34 ****
#ifndef _CPP_BACKWARD_OSTREAM_H
#define _CPP_BACKWARD_OSTREAM_H 1
! #include <iostream.h>
#endif
--- 28,34 ----
#ifndef _CPP_BACKWARD_OSTREAM_H
#define _CPP_BACKWARD_OSTREAM_H 1
! #include "iostream.h"
#endif
Index: include/backward/pair.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/pair.h,v
retrieving revision 1.4
diff -c -p -r1.4 pair.h
*** pair.h 2001/03/04 21:34:00 1.4
--- pair.h 2001/03/31 20:09:14
***************
*** 28,36 ****
#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;
--- 28,34 ----
Index: include/backward/rope.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/rope.h,v
retrieving revision 1.3
diff -c -p -r1.3 rope.h
*** rope.h 2001/03/12 18:49:31 1.3
--- rope.h 2001/03/31 20:09:14
***************
*** 15,21 ****
#define _CPP_BACKWARD_ROPE_H 1
#include "hashtable.h"
! #include <ext/stl_rope.h>
using std::char_producer;
using std::sequence_buffer;
--- 15,21 ----
#define _CPP_BACKWARD_ROPE_H 1
#include "hashtable.h"
! #include <ext/rope>
using std::char_producer;
using std::sequence_buffer;
Index: include/backward/set.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/set.h,v
retrieving revision 1.2
diff -c -p -r1.2 set.h
*** set.h 2001/03/04 21:34:00 1.2
--- set.h 2001/03/31 20:09:15
***************
*** 28,34 ****
#define _CPP_BACKWARD_SET_H 1
#include "tree.h"
! #include <bits/stl_set.h>
using std::set;
--- 28,34 ----
#define _CPP_BACKWARD_SET_H 1
#include "tree.h"
! #include <bits/std_set.h>
using std::set;
Index: include/backward/stack.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/stack.h,v
retrieving revision 1.2
diff -c -p -r1.2 stack.h
*** stack.h 2001/03/04 21:34:00 1.2
--- stack.h 2001/03/31 20:09:15
***************
*** 30,41 ****
#include "vector.h"
#include "deque.h"
#include "heap.h"
! #include <bits/stl_stack.h>
! #include <bits/stl_queue.h>
using std::stack;
- using std::queue;
- using std::priority_queue;
#endif /* _CPP_BACKWARD_STACK_H */
--- 30,39 ----
#include "vector.h"
#include "deque.h"
#include "heap.h"
! #include "queue.h"
! #include <bits/std_stack.h>
using std::stack;
#endif /* _CPP_BACKWARD_STACK_H */
Index: include/backward/stream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/stream.h,v
retrieving revision 1.3
diff -c -p -r1.3 stream.h
*** stream.h 2000/12/23 07:13:57 1.3
--- stream.h 2001/03/31 20:09:15
***************
*** 28,34 ****
#ifndef _CPP_BACKWARD_STREAM_H
#define _CPP_BACKWARD_STREAM_H 1
! #include <iostream.h>
#endif
--- 28,34 ----
#ifndef _CPP_BACKWARD_STREAM_H
#define _CPP_BACKWARD_STREAM_H 1
! #include "iostream.h"
#endif
Index: include/backward/strstream.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/strstream.h,v
retrieving revision 1.5
diff -c -p -r1.5 strstream.h
*** strstream.h 2000/12/23 07:13:57 1.5
--- strstream.h 2001/03/31 20:09:15
***************
*** 30,36 ****
#ifndef _CPP_BACKWARD_STRSTREAM_H
#define _CPP_BACKWARD_STRSTREAM_H 1
! #include <strstream>
using std::strstreambuf;
using std::istrstream;
--- 30,36 ----
#ifndef _CPP_BACKWARD_STRSTREAM_H
#define _CPP_BACKWARD_STRSTREAM_H 1
! #include "strstream"
using std::strstreambuf;
using std::istrstream;
Index: include/backward/tempbuf.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/tempbuf.h,v
retrieving revision 1.2
diff -c -p -r1.2 tempbuf.h
*** tempbuf.h 2001/03/04 21:34:00 1.2
--- tempbuf.h 2001/03/31 20:09:15
***************
*** 27,55 ****
#ifndef _CPP_BACKWARD_TEMPBUF_H
#define _CPP_BACKWARD_TEMPBUF_H 1
- #ifndef _CPP_BACKWARD_PAIR_H
#include "pair.h"
! #endif
! #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;
#endif /* _CPP_BACKWARD_TEMPBUF_H */
--- 27,45 ----
#ifndef _CPP_BACKWARD_TEMPBUF_H
#define _CPP_BACKWARD_TEMPBUF_H 1
#include "pair.h"
! #include "iterator.h"
#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
#include <bits/type_traits.h>
#include <bits/stl_construct.h>
#include <bits/stl_uninitialized.h>
#include <bits/stl_tempbuf.h>
using std::get_temporary_buffer;
using std::return_temporary_buffer;
! using std::temporary_buffer;
#endif /* _CPP_BACKWARD_TEMPBUF_H */
Index: include/backward/tree.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/backward/tree.h,v
retrieving revision 1.2
diff -c -p -r1.2 tree.h
*** tree.h 2001/03/04 21:34:00 1.2
--- tree.h 2001/03/31 20:09:15
***************
*** 1,6 ****
/*
! *
! * Copyright (c) 1996,1997
* Silicon Graphics Computer Systems, Inc.
*
* Permission to use, copy, modify, distribute and sell this software
--- 1,6 ----
+
/*
! * Copyright (c) 1997
* Silicon Graphics Computer Systems, Inc.
*
* Permission to use, copy, modify, distribute and sell this software
***************
*** 11,44 ****
* 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_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 */
// Local Variables:
// mode:C++
// End:
--- 11,26 ----
* 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>
using std::rb_tree;
+ #endif
// Local Variables:
// mode:C++
// End:
Index: include/bits/std_queue.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/std_queue.h,v
retrieving revision 1.2
diff -c -p -r1.2 std_queue.h
*** std_queue.h 2001/02/19 18:52:25 1.2
--- std_queue.h 2001/03/31 20:09:16
***************
*** 34,40 ****
#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>
--- 34,39 ----
Index: include/bits/std_vector.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/std_vector.h,v
retrieving revision 1.3
diff -c -p -r1.3 std_vector.h
*** std_vector.h 2001/02/19 18:52:25 1.3
--- std_vector.h 2001/03/31 20:09:16
***************
*** 35,41 ****
#include <bits/stl_construct.h>
#include <bits/stl_uninitialized.h>
#include <bits/stl_vector.h>
! #include <ext/stl_bvector.h>
#endif /* _CPP_VECTOR */
--- 35,41 ----
#include <bits/stl_construct.h>
#include <bits/stl_uninitialized.h>
#include <bits/stl_vector.h>
! #include <bits/stl_bvector.h>
#endif /* _CPP_VECTOR */
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.79
diff -c -p -r1.79 Makefile.am
*** Makefile.am 2001/03/28 01:19:42 1.79
--- Makefile.am 2001/03/31 20:09:19
*************** base_headers = \
*** 94,100 ****
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
--- 94,100 ----
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 = \
*** 104,121 ****
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
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
c_base_headers = \
bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
--- 104,121 ----
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/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 \
Index: testsuite/ext/headers.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/ext/headers.cc,v
retrieving revision 1.1
diff -c -p -r1.1 headers.cc
*** headers.cc 2000/04/21 20:33:34 1.1
--- headers.cc 2001/03/31 20:09:21
***************
*** 1,6 ****
// 1999-06-23 bkoz
! // Copyright (C) 1999 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
--- 1,6 ----
// 1999-06-23 bkoz
! // 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,33 ****
// 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() { }
--- 23,31 ----