basic_ios.h: Remove *_iter typedefs, change num* typedefs to num_*.

2003-08-11  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/basic_ios.h: Remove *_iter typedefs, change num*
	typedefs to num_*.
	* include/bits/basic_ios.tcc: Same.
	* include/bits/istream.tcc: Same.
	* include/bits/locale_facets.h: Same.
	* include/bits/ostream.tcc: Same.
	* include/std/std_istream.h: Same.
	* include/std/std_ostream.h: Same.
	* testsuite/26_numerics/complex_inserters_extractors.cc: Fix.

	* include/ext/rope: Remove build warning.

From-SVN: r70357

10 files changed, 89 insertions, 84 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ab9226c..1f1db93 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-11  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/basic_ios.h: Remove *_iter typedefs, change num*
+	typedefs to num_*.	
+	* include/bits/basic_ios.tcc: Same.
+	* include/bits/istream.tcc: Same.
+	* include/bits/locale_facets.h: Same.
+	* include/bits/ostream.tcc: Same.
+	* include/std/std_istream.h: Same.
+	* include/std/std_ostream.h: Same.
+	* testsuite/26_numerics/complex_inserters_extractors.cc: Fix.
+
+	* include/ext/rope: Remove build warning.
+	
 2003-08-11  Andreas Jaeger  <aj@suse.de>
 
 	* include/Makefile.am (stamp-c_base): Add dependency on stamp-bits
diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h
index 59ecfed..7e5b605 100644
--- a/libstdc++-v3/include/bits/basic_ios.h
+++ b/libstdc++-v3/include/bits/basic_ios.h
@@ -76,10 +76,10 @@ namespace std
        *  @endif
       */
       typedef ctype<_CharT>                          __ctype_type;
-      typedef ostreambuf_iterator<_CharT, _Traits>   __ostreambuf_iter;
-      typedef num_put<_CharT, __ostreambuf_iter>     __numput_type;
-      typedef istreambuf_iterator<_CharT, _Traits>   __istreambuf_iter;
-      typedef num_get<_CharT, __istreambuf_iter>     __numget_type;
+      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >     
+						     __num_put_type;
+      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >     
+      						     __num_get_type;
       //@}
       
       // Data members:
@@ -92,9 +92,9 @@ namespace std
       // Cached use_facet<ctype>, which is based on the current locale info.
       const __ctype_type*                            _M_ctype;      
       // For ostream.
-      const __numput_type*                           _M_num_put;
+      const __num_put_type*                          _M_num_put;
       // For istream.
-      const __numget_type*                           _M_num_get;
+      const __num_get_type*                          _M_num_get;
 
     public:
       //@{
diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc
index d0a8ff3..9df5f48 100644
--- a/libstdc++-v3/include/bits/basic_ios.tcc
+++ b/libstdc++-v3/include/bits/basic_ios.tcc
@@ -167,10 +167,10 @@ namespace std
     {
       if (__builtin_expect(has_facet<__ctype_type>(__loc), true))
 	_M_ctype = &use_facet<__ctype_type>(__loc);
-      if (__builtin_expect(has_facet<__numput_type>(__loc), true))
-	_M_num_put = &use_facet<__numput_type>(__loc); 
-      if (__builtin_expect(has_facet<__numget_type>(__loc), true))
-	_M_num_get = &use_facet<__numget_type>(__loc); 
+      if (__builtin_expect(has_facet<__num_put_type>(__loc), true))
+	_M_num_put = &use_facet<__num_put_type>(__loc); 
+      if (__builtin_expect(has_facet<__num_get_type>(__loc), true))
+	_M_num_get = &use_facet<__num_get_type>(__loc); 
     }
 
   // Inhibit implicit instantiations for required instantiations,
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 7f26f64..543d94d 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -56,10 +56,10 @@ namespace std
 	      __streambuf_type* __sb = __in.rdbuf();
 	      __int_type __c = __sb->sgetc();
 
-	      __check_facet(__in._M_ctype);
+	      const __ctype_type& __ct = __check_facet(__in._M_ctype);
 	      while (!traits_type::eq_int_type(__c, __eof)
-		     && __in._M_ctype->is(ctype_base::space, 
-					  traits_type::to_char_type(__c)))
+		     && __ct.is(ctype_base::space, 
+				traits_type::to_char_type(__c)))
 		  __c = __sb->snextc();
 
 #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -117,7 +117,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -142,9 +143,10 @@ namespace std
 	{
 	  try 
 	    {
-	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	      long __l;
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
+	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __l);
 #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 	      // 118. basic_istream uses nonexistent num_get member functions.
 	      if (!(__err & ios_base::failbit)
@@ -179,7 +181,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -204,9 +207,10 @@ namespace std
 	{
 	  try 
 	    {
-	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	      long __l;
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
+	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __l);
 #ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 	      // 118. basic_istream uses nonexistent num_get member functions.
 	      if (!(__err & ios_base::failbit)
@@ -241,7 +245,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -267,7 +272,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -293,7 +299,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -320,7 +327,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -346,7 +354,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -373,7 +382,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -399,7 +409,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -425,7 +436,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -451,7 +463,8 @@ namespace std
 	  try 
 	    {
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __n);
+	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
+	      __ng.get(*this, 0, *this, __err, __n);
 	      this->setstate(__err);
 	    }
 	  catch(...)
@@ -1027,14 +1040,16 @@ namespace std
 	      if (__num <= 0)
 		__num = numeric_limits<streamsize>::max();
 	      
-	      const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc());
+	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
+
 	      const int_type __eof = _Traits::eof();
 	      __streambuf_type* __sb = __in.rdbuf();
 	      int_type __c = __sb->sgetc();
 	      
 	      while (__extracted < __num - 1 
 		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ctype.is(ctype_base::space, _Traits::to_char_type(__c)))
+		     && !__ct.is(ctype_base::space, 
+				 _Traits::to_char_type(__c)))
 		{
 		  *__s++ = _Traits::to_char_type(__c);
 		  ++__extracted;
@@ -1073,13 +1088,13 @@ namespace std
       typedef typename __istream_type::__ctype_type 	__ctype_type;
       typedef typename __istream_type::int_type 	__int_type;
 
-      const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc());
+      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
       const __int_type __eof = _Traits::eof();	      
       __streambuf_type* __sb = __in.rdbuf();
       __int_type __c = __sb->sgetc();
 
       while (!_Traits::eq_int_type(__c, __eof) 
-	     && __ctype.is(ctype_base::space, _Traits::to_char_type(__c)))
+	     && __ct.is(ctype_base::space, _Traits::to_char_type(__c)))
 	__c = __sb->snextc();
 
        if (_Traits::eq_int_type(__c, __eof))
@@ -1110,14 +1125,14 @@ namespace std
 	  __size_type __n;
 	  __n = __w > 0 ? static_cast<__size_type>(__w) : __str.max_size();
 
-	  const __ctype_type& __ctype = use_facet<__ctype_type>(__in.getloc());
+	  const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
 	  const __int_type __eof = _Traits::eof();
 	  __streambuf_type* __sb = __in.rdbuf();
 	  __int_type __c = __sb->sgetc();
 	  
 	  while (__extracted < __n 
 		 && !_Traits::eq_int_type(__c, __eof)
-		 && !__ctype.is(ctype_base::space, _Traits::to_char_type(__c)))
+		 && !__ct.is(ctype_base::space, _Traits::to_char_type(__c)))
 	    {
 	      __str += _Traits::to_char_type(__c);
 	      ++__extracted;
@@ -1161,8 +1176,7 @@ namespace std
 	  const __int_type __eof = _Traits::eof();
 	  __testdelim = _Traits::eq_int_type(__c, __idelim);
 
-	  while (__extracted <= __n 
-		 && !_Traits::eq_int_type(__c, __eof)
+	  while (__extracted <= __n && !_Traits::eq_int_type(__c, __eof)
 		 && !__testdelim)
 	    {
 	      __str += _Traits::to_char_type(__c);
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 39a6a246..234a0cf 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -917,22 +917,6 @@ namespace std
   template<typename _CharT, typename _InIter>
     locale::id num_get<_CharT, _InIter>::id;
 
-#if 0
-  // Partial specialization for istreambuf_iterator, so can use traits_type.
-  template<typename _CharT>
-    class num_get<_CharT, istreambuf_iterator<_CharT> >;
-
-      iter_type 
-      _M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&, 
-		       string& __xtrc) const;
-
-      iter_type 
-      _M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&, 
-		     string& __xtrc, int& __base) const;
-
-      virtual iter_type 
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
-#endif
 
   template<typename _CharT, typename _OutIter>
     class num_put : public locale::facet, public __num_base
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 3d11b3b..401b58f 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -160,9 +160,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
@@ -189,14 +188,14 @@ namespace std
 	      bool __b = false;
 	      char_type __c = this->fill();
 	      ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	      __check_facet(this->_M_num_put);
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
 	      if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
 		{
 		  unsigned long __l = static_cast<unsigned long>(__n);
-		  __b = this->_M_num_put->put(*this, *this, __c, __l).failed();
+		  __b = __np.put(*this, *this, __c, __l).failed();
 		}
 	      else
-		__b = this->_M_num_put->put(*this, *this, __c, __n).failed();
+		__b = __np.put(*this, *this, __c, __n).failed();
 	      if (__b)  
 		this->setstate(ios_base::badbit);
 	    }
@@ -221,9 +220,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
@@ -251,15 +249,15 @@ namespace std
 	      bool __b = false;
 	      char_type __c = this->fill();
 	      ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	      __check_facet(this->_M_num_put);
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
 	      if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
 		{
 		  unsigned long long __l;
 		  __l = static_cast<unsigned long long>(__n);
-		  __b = this->_M_num_put->put(*this, *this, __c, __l).failed();
+		  __b = __np.put(*this, *this, __c, __l).failed();
 		}
 	      else
-		__b = this->_M_num_put->put(*this, *this, __c, __n).failed();
+		__b = __np.put(*this, *this, __c, __n).failed();
 	      if (__b)  
 		this->setstate(ios_base::badbit);
 	    }
@@ -284,9 +282,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
@@ -311,9 +308,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
@@ -337,9 +333,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
@@ -363,9 +358,8 @@ namespace std
 	{
 	  try 
 	    {
-	      __check_facet(this->_M_num_put);
-	      if (this->_M_num_put->put(*this, *this, this->fill(), 
-					__n).failed())
+	      const __num_put_type& __np = __check_facet(this->_M_num_put);
+	      if (__np.put(*this, *this, this->fill(), __n).failed())
 		this->setstate(ios_base::badbit);
 	    }
 	  catch(...)
diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope
index e28d0b6..7bd6671 100644
--- a/libstdc++-v3/include/ext/rope
+++ b/libstdc++-v3/include/ext/rope
@@ -189,8 +189,7 @@ class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void,
         {
             if (__len + _M_buf_count <= _Buf_sz) {
                 size_t __i = _M_buf_count;
-                size_t __j = 0;
-                for (; __j < __len; __i++, __j++) {
+                for (size_t __j = 0; __j < __len; __i++, __j++) {
                     _M_buffer[__i] = __s[__j];
                 }
                 _M_buf_count += __len;
diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h
index 6e5efdc..ce4e611 100644
--- a/libstdc++-v3/include/std/std_istream.h
+++ b/libstdc++-v3/include/std/std_istream.h
@@ -70,8 +70,8 @@ namespace std
       typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
       typedef basic_ios<_CharT, _Traits>		__ios_type;
       typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef istreambuf_iterator<_CharT, _Traits>	__istreambuf_iter;
-      typedef num_get<_CharT, __istreambuf_iter>        __numget_type;
+      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >        
+ 							__num_get_type;
       typedef ctype<_CharT>           			__ctype_type;
 
       template<typename _CharT2, typename _Traits2>
diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h
index bfea017..2766954 100644
--- a/libstdc++-v3/include/std/std_ostream.h
+++ b/libstdc++-v3/include/std/std_ostream.h
@@ -69,8 +69,8 @@ namespace std
       typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
       typedef basic_ios<_CharT, _Traits>		__ios_type;
       typedef basic_ostream<_CharT, _Traits>		__ostream_type;
-      typedef ostreambuf_iterator<_CharT, _Traits>	__ostreambuf_iter;
-      typedef num_put<_CharT, __ostreambuf_iter>        __numput_type;
+      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >        
+      							__num_put_type;
       typedef ctype<_CharT>           			__ctype_type;
 
       template<typename _CharT2, typename _Traits2>
diff --git a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
index 9f4e96b..f285fb7 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
@@ -108,8 +108,8 @@ void test02()
   bool test = true;
 
   // Construct locale with specialized facets.
-  typedef gnu_sstream::__numput_type numput_type;
-  typedef gnu_sstream::__numget_type numget_type;
+  typedef gnu_sstream::__num_put_type numput_type;
+  typedef gnu_sstream::__num_get_type numget_type;
   std::locale loc_c = std::locale::classic();
   std::locale loc_1(loc_c, new numput_type);
   std::locale loc_2(loc_1, new numget_type);