aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Snyder <snyder@fnal.gov>2001-05-31 20:33:06 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2001-05-31 20:33:06 +0000
commit59bd14d84a08f26c4c90ba18fa63fb446a3bb44e (patch)
tree06efeaf601aa00bac8022d1da4e9b024651a3084
parentb3276c7a5dfe301dff29109bd96cb159a7651c24 (diff)
downloadgcc-59bd14d84a08f26c4c90ba18fa63fb446a3bb44e.zip
gcc-59bd14d84a08f26c4c90ba18fa63fb446a3bb44e.tar.gz
gcc-59bd14d84a08f26c4c90ba18fa63fb446a3bb44e.tar.bz2
istream.tcc: Include std_ostream.h.
2001-05-27 scott snyder <snyder@fnal.gov> libstdc++/2976 * include/bits/istream.tcc: Include std_ostream.h. From-SVN: r42754
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/istream.tcc1
-rw-r--r--libstdc++-v3/include/bits/std_istream.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1359361..47d2ae4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-27 scott snyder <snyder@fnal.gov>
+
+ libstdc++/2976
+ * include/bits/istream.tcc: Include std_ostream.h.
+
2001-05-31 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/2997
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 45f8ed2..8132840 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -30,6 +30,7 @@
//
#include <bits/std_locale.h>
+#include <bits/std_ostream.h> // for flush()
namespace std
{
diff --git a/libstdc++-v3/include/bits/std_istream.h b/libstdc++-v3/include/bits/std_istream.h
index ec3791e..ad8d25e 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;