istream.tcc: Use ios_base::iostate in place of iostate throughout.

	* include/bits/istream.tcc: Use ios_base::iostate in place of
	iostate throughout.  Insert `typename' keyword where necessary.
	* include/bits/ostream.tcc: Insert `typename' keyword where
	necessary.

From-SVN: r39743

3 files changed, 29 insertions, 22 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3c35d75..71edd6a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* include/bits/istream.tcc: Use ios_base::iostate in place of
+	iostate throughout.  Insert `typename' keyword where necessary.
+	* include/bits/ostream.tcc: Insert `typename' keyword where
+	necessary.
+	
 2001-02-15  Jeffrey Oldham  <oldham@codesourcery.com>
 
         * include/bits/c++config (_GLIBCPP_FULLY_COMPLIANT_HEADERS):
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 571af89..fdec945 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -151,7 +151,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -175,7 +175,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -199,7 +199,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -223,7 +223,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -247,7 +247,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -271,7 +271,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -295,7 +295,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -320,7 +320,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -344,7 +344,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -369,7 +369,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -393,7 +393,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -417,7 +417,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -441,7 +441,7 @@ namespace std {
       if (__cerb) 
 	{
 	  try {
-	    iostate __err = iostate(ios_base::goodbit);
+	    ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	    _M_fnumget->get(*this, 0, *this, __err, __n);
 	    this->setstate(__err);
 	  }
@@ -988,7 +988,7 @@ namespace std {
     operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c)
     {
       typedef basic_istream<_CharT, _Traits> 		__istream_type;
-      __istream_type::sentry __cerb(__in, false);
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
 	{
 	  try {
@@ -1018,7 +1018,7 @@ namespace std {
       typedef ctype<_CharT>     			__ctype_type;
       int_type __extracted = 0;
 
-      __istream_type::sentry __cerb(__in, false);
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb)
 	{
 	  try {
@@ -1115,7 +1115,7 @@ namespace std {
       typedef typename __string_type::size_type		__size_type;
       __int_type __extracted = 0;
 
-      __istream_type::sentry __cerb(__in, false);
+      typename __istream_type::sentry __cerb(__in, false);
       if (__cerb) 
 	{
 	  __str.erase();
@@ -1166,7 +1166,7 @@ namespace std {
 
       __size_type __extracted = 0;
       bool __testdelim = false;
-      __istream_type::sentry __cerb(__in, true);
+      typename __istream_type::sentry __cerb(__in, true);
       if (__cerb) 
 	{
 	  __str.erase();
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index db6a09e..64e006f 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -491,7 +491,7 @@ namespace std {
     operator<<(basic_ostream<_CharT, _Traits>& __out, _CharT __c)
     {
       typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      __ostream_type::sentry __cerb(__out);
+      typename __ostream_type::sentry __cerb(__out);
       if (__cerb)
 	{
 	  try {
@@ -524,7 +524,7 @@ namespace std {
     operator<<(basic_ostream<char, _Traits>& __out, char __c)
     {
       typedef basic_ostream<char, _Traits> __ostream_type;
-      __ostream_type::sentry __cerb(__out);
+      typename __ostream_type::sentry __cerb(__out);
       if (__cerb)
 	{
 	  try {
@@ -556,7 +556,7 @@ namespace std {
     operator<<(basic_ostream<_CharT, _Traits>& __out, const _CharT* __s)
     {
       typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      __ostream_type::sentry __cerb(__out);
+      typename __ostream_type::sentry __cerb(__out);
       if (__cerb)
 	{
 	  try {
@@ -592,7 +592,7 @@ namespace std {
 // 167.  Improper use of traits_type::length()
       typedef char_traits<char>		     __ctraits_type;
 #endif
-      __ostream_type::sentry __cerb(__out);
+      typename __ostream_type::sentry __cerb(__out);
       if (__cerb)
 	{
 	  size_t __clen = __ctraits_type::length(__s);
@@ -632,7 +632,7 @@ namespace std {
     operator<<(basic_ostream<char, _Traits>& __out, const char* __s)
     {
       typedef basic_ostream<char, _Traits> __ostream_type;
-      __ostream_type::sentry __cerb(__out);
+      typename __ostream_type::sentry __cerb(__out);
       if (__cerb)
 	{
 	  try {