From 59bd14d84a08f26c4c90ba18fa63fb446a3bb44e Mon Sep 17 00:00:00 2001 From: Scott Snyder Date: Thu, 31 May 2001 20:33:06 +0000 Subject: [PATCH] istream.tcc: Include std_ostream.h. 2001-05-27 scott snyder libstdc++/2976 * include/bits/istream.tcc: Include std_ostream.h. From-SVN: r42754 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/istream.tcc | 1 + libstdc++-v3/include/bits/std_istream.h | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 13593614395..47d2ae4fe57 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2001-05-27 scott snyder + + libstdc++/2976 + * include/bits/istream.tcc: Include std_ostream.h. + 2001-05-31 Benjamin Kosnik libstdc++/2997 diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 45f8ed2267c..813284047e8 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -30,6 +30,7 @@ // #include +#include // for flush() namespace std { diff --git a/libstdc++-v3/include/bits/std_istream.h b/libstdc++-v3/include/bits/std_istream.h index ec3791e24d6..ad8d25edb51 100644 --- a/libstdc++-v3/include/bits/std_istream.h +++ b/libstdc++-v3/include/bits/std_istream.h @@ -46,7 +46,6 @@ namespace std class basic_istream : virtual public basic_ios<_CharT, _Traits> { public: - // Types (inherited from basic_ios (27.4.4)): typedef _CharT char_type; typedef typename _Traits::int_type int_type; @@ -215,7 +214,6 @@ namespace std class basic_istream<_CharT, _Traits>::sentry { public: - typedef _Traits traits_type; typedef basic_streambuf<_CharT, _Traits> __streambuf_type; typedef basic_istream<_CharT, _Traits> __istream_type; @@ -267,7 +265,6 @@ namespace std public basic_ostream<_CharT, _Traits> { public: - // Non-standard Types: typedef basic_istream<_CharT, _Traits> __istream_type; typedef basic_ostream<_CharT, _Traits> __ostream_type;