aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2001-03-12 18:30:29 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2001-03-12 18:30:29 +0000
commitbc4f48d7757464771afd7e1254f4b362fe1784be (patch)
tree76d54dfa6553be0f068114cb9667cbff1b0a3059
parent8f9995782ec52de2f94983cb1f0f230ed56c9136 (diff)
downloadgcc-bc4f48d7757464771afd7e1254f4b362fe1784be.zip
gcc-bc4f48d7757464771afd7e1254f4b362fe1784be.tar.gz
gcc-bc4f48d7757464771afd7e1254f4b362fe1784be.tar.bz2
istream.tcc (basic_istream<_CharT, [...]): Fix typo.
2001-03-12 Benjamin Kosnik <bkoz@redhat.com> * include/bits/istream.tcc (basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)): Fix typo. From-SVN: r40417
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/istream.tcc2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c140e19..c43a50f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-12 Benjamin Kosnik <bkoz@redhat.com>
+
+ * include/bits/istream.tcc (basic_istream<_CharT, _Traits>&
+ operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)):
+ Fix typo.
+
2001-03-11 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/ext/stl_hashtable.h: Change type of __n to size_t
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 0ea81cf..c13bf67 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -977,7 +977,7 @@ namespace std {
typedef typename _Traits::int_type int_type;
typedef _CharT char_type;
typedef ctype<_CharT> __ctype_type;
- int_type __extracted = 0;
+ streamsize __extracted = 0;
typename __istream_type::sentry __cerb(__in, false);
if (__cerb)