diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-26 21:22:57 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-26 21:22:57 +0000 |
| commit | ec57e6865c9410c4dd722f1441802f88927794b0 (patch) | |
| tree | 204c9491c910234f41b85259eb37e094ec96c64a /libstdc++-v3/libio | |
| parent | 2475beace855d8d5579d49fe0e97b4b48c57f350 (diff) | |
| download | ppe42-gcc-ec57e6865c9410c4dd722f1441802f88927794b0.tar.gz ppe42-gcc-ec57e6865c9410c4dd722f1441802f88927794b0.zip | |
2001-06-26 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/sbuf_iter.h: Change to..
* include/bits/streambuf_iterator.h: This.
* include/bits/stl_iterator.h: Take out of here...
* include/bits/stream_iterator.h: Add.
* src/Makefile.am (base_headers): Add streambuf_iterator,
stream_iterator.h
* src/Makefile.in: Regenerate.
* include/bits/std_string.h: Adjust includes.
* include/bits/basic_ios.h: Same.
* include/bits/locale_facets.tcc: Same.
* include/bits/std_iosfwd.h: Same.
* include/bits/std_iterator.h: Add istream, ostream includes.
* include/bits/stl_iterator.h: Tweak.
* testsuite/24_iterators/ostream_iterator.cc: Add test.
* testsuite/24_iterators/istream_iterator.cc: Same.
* testsuite/23_containers/multiset.cc: Add iterator include.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43592 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libio')
| -rw-r--r-- | libstdc++-v3/libio/Makefile.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index dbd0a04fa6c..ac805d2bf42 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -114,7 +114,7 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = 1.3 cygnus mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la +@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES @@ -126,21 +126,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ -INCLUDES = \ - -nostdinc++ \ - -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \ - $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) -libio_headers = \ - libio.h libioP.h iolibio.h +libio_headers = libio.h libioP.h iolibio.h -@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\ -@GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \ -@GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c +@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = -@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\ -@GLIBCPP_NEED_WLIBIO_TRUE@ wfiledoalloc.c wfileops.c wgenops.c iofwide.c +@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = EXTRA_DIST = iostreamP.h |
