X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fbits%2Fistream.tcc;h=e0014ea7e1cb8955539d92ba94eb29c21817a18e;hb=ac1d846998fd3f071c843ab2b48e9316ce8cec7d;hp=e794fe33060cdbb22901c262680f450ed355c5bf;hpb=337f7cc679984eabd07ea03b10f1463a3ae9881a;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index e794fe33060..e0014ea7e1c 100644
--- 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