From 5feb272b7a4f084ae628f16c7e252a14b3b47764 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 22 Nov 2000 00:05:16 +0000 Subject: strstream.cc: Adjust includes. 2000-11-21 Benjamin Kosnik * src/strstream.cc: Adjust includes. * src/Makefile.am (base_headers): Remove std_strstream.h, add backwards/strstream.h. (std_headers): Remove strstream. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (headers): Remove new.h * libsupc++/Makefile.in: Regenerate. * include/std/strstream: Remove. * include/backward/strstream.h: Replace with... * include/bits/std_strstream.h: ...this. Move. * include/backward/complex.h: Remove SGIisms. * include/backward/streambuf.h: Same. * include/backward/stream.h: Same. * include/backward/ostream.h: Same. * include/backward/istream.h: Same. * include/backward/iostream.h: Same. * include/backward/iomanip.h: Same. * include/backward/fstream.h: Same. * libsupc++/new.h: Add using declarations for bad_alloc, nothrow_t, and nothrow, move to ... * include/backward/new.h: ...here. From-SVN: r37632 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/std/strstream | 3 --- libstdc++-v3/libsupc++/Makefile.am | 2 +- libstdc++-v3/libsupc++/Makefile.in | 2 +- libstdc++-v3/src/Makefile.am | 8 ++++---- libstdc++-v3/src/Makefile.in | 4 ++-- libstdc++-v3/src/strstream.cc | 4 ++-- 7 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 libstdc++-v3/include/std/strstream diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 853e360..2c020f7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2000-11-21 Benjamin Kosnik + * src/strstream.cc: Adjust includes. + * src/Makefile.am (base_headers): Remove std_strstream.h, add + backwards/strstream.h. + (std_headers): Remove strstream. + * src/Makefile.in: Regenerate. + * libsupc++/Makefile.am (headers): Remove new.h + * libsupc++/Makefile.in: Regenerate. + * include/std/strstream: Remove. * include/backward/strstream.h: Replace with... * include/bits/std_strstream.h: ...this. Move. * include/backward/complex.h: Remove SGIisms. diff --git a/libstdc++-v3/include/std/strstream b/libstdc++-v3/include/std/strstream deleted file mode 100644 index 5326714..0000000 --- a/libstdc++-v3/include/std/strstream +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef _CPP_STRSTREAM -#include -#endif diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index b5948d4..3238685 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -77,7 +77,7 @@ INCLUDES = \ $(CONFIG_INCLUDES) -I$(top_builddir)/include headers = \ - cxxabi.h exception new new.h typeinfo + cxxabi.h exception new typeinfo sources = \ del_op.cc \ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index fb6f9cb..0b6892e 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -151,7 +151,7 @@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)/include -headers = cxxabi.h exception new new.h typeinfo +headers = cxxabi.h exception new typeinfo sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception_support.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index d131cad..a2a536d 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.47 2000/11/13 23:38:41 bkoz Exp $ +## $Id: Makefile.am,v 1.48 2000/11/16 01:44:03 mmitchel Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -101,7 +101,7 @@ base_headers = \ 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/fstream.h backward/strstream.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 \ @@ -117,7 +117,7 @@ base_headers = \ bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \ bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h \ bits/concept_checks.h bits/container_concepts.h \ - bits/sequence_concepts.h bits/std_strstream.h \ + bits/sequence_concepts.h \ ext/ropeimpl.h ext/stl_rope.h \ ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h \ ext/stl_hashtable.h ext/stl_hash_fun.h \ @@ -152,7 +152,7 @@ std_headers = \ algorithm bitset complex deque fstream functional \ iomanip ios iosfwd iostream istream iterator limits list locale \ map memory numeric ostream queue set sstream stack stdexcept \ - streambuf string strstream utility valarray vector \ + streambuf string utility valarray vector \ cassert cctype cerrno cfloat climits clocale ciso646 \ cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \ cstring ctime cwchar cwctype diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 1803389..fea067d 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -147,7 +147,7 @@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES) -base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/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/exception_support.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 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 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/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_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/std_strstream.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector +base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/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/exception_support.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 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 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/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_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.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 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 @@ -158,7 +158,7 @@ c_shadow_headers = assert.h ctype.h errno.h float.h limits.h locale.h math.h s @GLIBCPP_USE_CSHADOW_TRUE@c_headers = $(c_base_headers) $(c_shadow_headers) @GLIBCPP_USE_CSHADOW_FALSE@c_headers = $(c_base_headers) -std_headers = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string strstream utility valarray vector cassert cctype cerrno cfloat climits clocale ciso646 cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype +std_headers = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string utility valarray vector cassert cctype cerrno cfloat climits clocale ciso646 cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype @GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h @GLIBCPP_NEED_LIBIO_FALSE@libio_headers = diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc index f1fe40f5..478bf10 100644 --- a/libstdc++-v3/src/strstream.cc +++ b/libstdc++-v3/src/strstream.cc @@ -17,8 +17,8 @@ // MAY BE REMOVED in a future standard revision. You should use the // header instead. -#include /* HACK HACK HACK */ -#include /* DITTO */ +#include +#include #include #include #include -- cgit v1.1