2001-09-25 Phil Edwards <pme@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / istream.tcc

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index e794fe3..e0014ea 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -465,7 +465,7 @@ namespace std
     }
 
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::int_type
+    typename basic_istream<_CharT, _Traits>::int_type
     basic_istream<_CharT, _Traits>::
     get(void)
     {
@@ -570,7 +570,7 @@ namespace std
                __throw_exception_again;
            }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
        this->setstate(ios_base::failbit);
       return *this;
@@ -670,7 +670,7 @@ namespace std
                __throw_exception_again;
            }
        }
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
        this->setstate(ios_base::failbit);
       return *this;
@@ -720,7 +720,7 @@ namespace std
     }
   
   template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::int_type
+    typename basic_istream<_CharT, _Traits>::int_type
     basic_istream<_CharT, _Traits>::
     peek(void)
     {
@@ -1176,7 +1176,7 @@ namespace std
          __in.width(0);
        }
 #ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
-// 2000-02-01 Number to be determined
+//211.  operator>>(istream&, string&) doesn't set failbit
       if (!__extracted)
        __in.setstate (ios_base::failbit);
 #endif