diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-18 18:08:46 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-18 18:08:46 +0000 |
| commit | bc8f8789e48ff14bedd9f87d767f83d57fb761aa (patch) | |
| tree | 765e0b144cbfe7b11f376d7c7026be8493b11a8d | |
| parent | 0cadbc52acc421d66ba17b7147ddbc8dd6b8fcc7 (diff) | |
| download | ppe42-gcc-bc8f8789e48ff14bedd9f87d767f83d57fb761aa.tar.gz ppe42-gcc-bc8f8789e48ff14bedd9f87d767f83d57fb761aa.zip | |
2000-09-18 Yuri V. Baskakov <yuribsk@lab.sun.mcst.ru>
* bits/std_bitset.h (operator>>): Change to char_type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36505 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/bits/std_bitset.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4de4ac33f46..3c0e5015b13 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2000-09-18 Yuri V. Baskakov <yuribsk@lab.sun.mcst.ru> + + * bits/std_bitset.h (operator>>): Change to char_type. + 2000-09-15 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * src/locale.cc (locale::locale(const char* __name)): Consolidate diff --git a/libstdc++-v3/bits/std_bitset.h b/libstdc++-v3/bits/std_bitset.h index 6556ee39806..52f567854cb 100644 --- a/libstdc++-v3/bits/std_bitset.h +++ b/libstdc++-v3/bits/std_bitset.h @@ -848,6 +848,7 @@ template <class _CharT, class _Traits, size_t _Nb> basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x) { + typedef typename _Traits::char_type char_type; basic_string<_CharT, _Traits> __tmp; __tmp.reserve(_Nb); @@ -864,8 +865,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x) break; } else { - char __c2 = _Traits::to_char_type(__c1); - char __c = __is.narrow(__c2, '*'); + char_type __c2 = _Traits::to_char_type(__c1); + char_type __c = __is.narrow(__c2, '*'); if (__c == '0' || __c == '1') __tmp.push_back(__c); |
