istream.tcc (ignore(streamsize), [...]): Reset _M_gcount to numeric_limits<streamsize...

2005-01-03  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
	int_type)): Reset _M_gcount to numeric_limits<streamsize>::min().
	* src/istream.cc (basic_istream<char>::ignore(streamsize, int_type),
	basic_istream<wchar_t>::ignore(streamsize, int_type)): Likewise.
	* src/istream.cc (basic_istream<char>::ignore(streamsize),
	basic_istream<wchar_t>::ignore(streamsize)): Likewise; fix a typo.

From-SVN: r92827

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d25535..1c52214 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-03  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
+       int_type)): Reset _M_gcount to numeric_limits<streamsize>::min().
+       * src/istream.cc (basic_istream<char>::ignore(streamsize, int_type),
+       basic_istream<wchar_t>::ignore(streamsize, int_type)): Likewise.
+       * src/istream.cc (basic_istream<char>::ignore(streamsize),
+       basic_istream<wchar_t>::ignore(streamsize)): Likewise; fix a typo.
+
 2005-01-02  Paolo Carlini  <pcarlini@suse.de>
 
        * src/istream.cc (basic_istream<char>::ignore(streamsize),

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 49cdc80..573c179 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -695,7 +695,7 @@ namespace std
                    }
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof))
-                   _M_gcount = 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }
@@ -742,7 +742,7 @@ namespace std
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof)
                      && !traits_type::eq_int_type(__c, __delim))
-                   _M_gcount = 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }

diff --git a/libstdc++-v3/src/istream.cc b/libstdc++-v3/src/istream.cc
index a49878a..5bdcaaf 100644 (file)
--- a/libstdc++-v3/src/istream.cc
+++ b/libstdc++-v3/src/istream.cc
@@ -146,7 +146,7 @@ namespace std
                    }
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof))
-                   _M_gcount == 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }
@@ -211,7 +211,7 @@ namespace std
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof)
                      && !traits_type::eq_int_type(__c, __delim))
-                   _M_gcount = 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }
@@ -424,7 +424,7 @@ namespace std
                    }
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof))
-                   _M_gcount == 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }
@@ -489,7 +489,7 @@ namespace std
                  if (__n == numeric_limits<streamsize>::max()
                      && !traits_type::eq_int_type(__c, __eof)
                      && !traits_type::eq_int_type(__c, __delim))
-                   _M_gcount = 0;
+                   _M_gcount = numeric_limits<streamsize>::min();
                  else
                    break;
                }