std_fstream.h (basic_filebuf): _M_pback_destroy to _M_destroy_pback.

2003-04-27  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/std_fstream.h (basic_filebuf): _M_pback_destroy to
	_M_destroy_pback. _M_pback_create to
	_M_create_pback. _M_underflow_common to
	_M_underflow. _M_really_overflow to _M_overflow.
	* include/bits/fstream.tcc: Same.
	* src/fstream.cc: Same.
	* include/std/std_streambuf.h (basic_streambuf): _M_in_cur_move to
	_M_move_in_cur.  _M_out_cur_move to _M_move_out_cur.
	* include/bits/streambuf.tcc: Same.
	* include/bits/fstream.tcc: Same.
	* include/bits/sstream.tcc: Same.

From-SVN: r66149

3 files changed, 19 insertions, 20 deletions

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 454660d..75bc0c8 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -126,8 +126,7 @@ namespace std
 	      const bool __testput = this->_M_out_beg < this->_M_out_lim;
 
 	      if (__testput 
-		  && traits_type::eq_int_type(_M_really_overflow(__eof), 
-					      __eof))
+		  && traits_type::eq_int_type(_M_overflow(__eof), __eof))
 		__testfail = true;
 
 #if 0
@@ -135,7 +134,7 @@ namespace std
 	      if (_M_last_overflowed)
 		{
 		  _M_output_unshift();
-		  _M_really_overflow(__eof);
+		  _M_overflow(__eof);
 		}
 #endif
 	    }
@@ -147,7 +146,7 @@ namespace std
 	  // NB: Do this here so that re-opened filebufs will be cool...
 	  this->_M_mode = ios_base::openmode(0);
 	  _M_destroy_internal_buffer();
-	  _M_pback_destroy();
+	  _M_destroy_pback();
 	  
 	  if (!_M_file.close())
 	    __testfail = true;
@@ -214,7 +213,7 @@ namespace std
 		__ret = traits_type::not_eof(__i);
 	      else
 		{
-		  _M_pback_create();
+		  _M_create_pback();
 		  *this->_M_in_cur = __c; 
 		  __ret = __i;
 		}
@@ -233,7 +232,7 @@ namespace std
 		    {
 		      if (!traits_type::eq(__c, *this->_M_in_cur))
 			{
-			  _M_pback_create();
+			  _M_create_pback();
 			  *this->_M_in_cur = __c;
 			}
 		      __ret = __i;
@@ -263,14 +262,14 @@ namespace std
 	  else if (__testput)
 	    {
 	      *this->_M_out_cur = traits_type::to_char_type(__c);
-	      _M_out_cur_move(1);
+	      _M_move_out_cur(1);
 	      __ret = traits_type::not_eof(__c);
 	    }
 	  else 
-	    __ret = this->_M_really_overflow(__c);
+	    __ret = this->_M_overflow(__c);
 	}
 
-      _M_last_overflowed = false;    // Set in _M_really_overflow, below.
+      _M_last_overflowed = false;    // Set in _M_overflow, below.
       return __ret;
     }
   
@@ -344,7 +343,7 @@ namespace std
   template<typename _CharT, typename _Traits>
     typename basic_filebuf<_CharT, _Traits>::int_type 
     basic_filebuf<_CharT, _Traits>::
-    _M_really_overflow(int_type __c)
+    _M_overflow(int_type __c)
     {
       int_type __ret = traits_type::eof();
       const bool __testput = this->_M_out_beg < this->_M_out_lim;
@@ -449,7 +448,7 @@ namespace std
       if (this->is_open() && !__testfail && (__testin || __testout)) 
 	{
 	  // Ditch any pback buffers to avoid confusion.
-	  _M_pback_destroy();
+	  _M_destroy_pback();
 
 	  if (__way != ios_base::cur || __off != 0)
 	    { 
diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc
index a138d25..801a34a 100644
--- a/libstdc++-v3/include/bits/sstream.tcc
+++ b/libstdc++-v3/include/bits/sstream.tcc
@@ -173,7 +173,7 @@ namespace std
 	  if ((__testout || __testboth)
 	      && __newoffo + __off >= 0 && __endo - __beg >= __newoffo + __off)
 	    {
-	      _M_out_cur_move(__newoffo + __off - (this->_M_out_cur - __beg));
+	      _M_move_out_cur(__newoffo + __off - (this->_M_out_cur - __beg));
 	      __ret = pos_type(__newoffo);
 	    }
 	}
@@ -217,7 +217,7 @@ namespace std
 	      if (__testposi)
 		this->_M_in_cur = this->_M_in_beg + __pos;
 	      if (__testposo)
-		_M_out_cur_move((__pos) - (this->_M_out_cur - __beg));
+		_M_move_out_cur((__pos) - (this->_M_out_cur - __beg));
 	      __ret = pos_type(off_type(__pos));
 	    }
 	}
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc
index 8623d25..05e5a65 100644
--- a/libstdc++-v3/include/bits/streambuf.tcc
+++ b/libstdc++-v3/include/bits/streambuf.tcc
@@ -48,7 +48,7 @@ namespace std
       if (_M_in_cur < _M_in_end)
 	{
 	  char_type __c = *this->_M_in_cur;
-	  _M_in_cur_move(1);
+	  _M_move_in_cur(1);
 	  __ret = traits_type::to_int_type(__c);
 	}
       else 
@@ -67,7 +67,7 @@ namespace std
 	__ret = this->pbackfail(traits_type::to_int_type(__c));
       else 
 	{
-	  _M_in_cur_move(-1);
+	  _M_move_in_cur(-1);
 	  __ret = traits_type::to_int_type(*this->_M_in_cur);
 	}
       return __ret;
@@ -81,7 +81,7 @@ namespace std
       int_type __ret;
       if (_M_in_beg < _M_in_cur)
 	{
-	  _M_in_cur_move(-1);
+	  _M_move_in_cur(-1);
 	  __ret = traits_type::to_int_type(*_M_in_cur);
 	}
       else 
@@ -98,7 +98,7 @@ namespace std
       if (_M_out_cur < _M_out_end)
 	{
 	  *_M_out_cur = __c;
-	  _M_out_cur_move(1);
+	  _M_move_out_cur(1);
 	  __ret = traits_type::to_int_type(__c);
 	}
       else
@@ -122,7 +122,7 @@ namespace std
 	      traits_type::copy(__s, _M_in_cur, __len);
 	      __ret += __len;
 	      __s += __len;
-	      _M_in_cur_move(__len);
+	      _M_move_in_cur(__len);
 	    }
 	  
 	  if (__ret < __n)
@@ -156,7 +156,7 @@ namespace std
 	      traits_type::copy(_M_out_cur, __s, __len);
 	      __ret += __len;
 	      __s += __len;
-	      _M_out_cur_move(__len);
+	      _M_move_out_cur(__len);
 	    }
 
 	  if (__ret < __n)
@@ -201,7 +201,7 @@ namespace std
 		{
 		  __xtrct = __sbout->sputn(__sbin->_M_in_cur, __avail);
 		  __ret += __xtrct;
-		  __sbin->_M_in_cur_move(__xtrct);
+		  __sbin->_M_move_in_cur(__xtrct);
 		  if (__xtrct != __avail)
 		    break;
 		}