diff options
| author | theraven <theraven@FreeBSD.org> | 2013-07-10 16:28:24 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2013-07-10 16:28:24 +0000 |
| commit | 214e4f8fe625ad54aac3b215909e0b994a5768ec (patch) | |
| tree | f757844d307e5ebbf92ab857f2376cceb7807147 /contrib/libc++/include/istream | |
| parent | c660176671bf640bee3fd09dbfa32ad187a9b942 (diff) | |
| download | FreeBSD-src-214e4f8fe625ad54aac3b215909e0b994a5768ec.zip FreeBSD-src-214e4f8fe625ad54aac3b215909e0b994a5768ec.tar.gz | |
Import new libcxxrt / libc++. This brings some bug fixes, including a potential race condition for static initialisers.
Diffstat (limited to 'contrib/libc++/include/istream')
| -rw-r--r-- | contrib/libc++/include/istream | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/libc++/include/istream b/contrib/libc++/include/istream index 3f629f6..f3e74c3 100644 --- a/contrib/libc++/include/istream +++ b/contrib/libc++/include/istream @@ -1144,8 +1144,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm) break; } ++__gc_; - char_type __ch = traits_type::to_char_type(__i); - if (traits_type::eq(__ch, static_cast<char_type>(__dlm))) + if (traits_type::eq_int_type(__i, __dlm)) break; } } @@ -1160,8 +1159,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm) break; } ++__gc_; - char_type __ch = traits_type::to_char_type(__i); - if (traits_type::eq(__ch, static_cast<char_type>(__dlm))) + if (traits_type::eq_int_type(__i, __dlm)) break; } } |
