aboutsummaryrefslogtreecommitdiff
path: root/include/istream
diff options
context:
space:
mode:
authorDavid Chisnall <theraven@FreeBSD.org>2013-07-10 10:49:31 +0000
committerDavid Chisnall <theraven@FreeBSD.org>2013-07-10 10:49:31 +0000
commit1c9014238e909c768bf84564733b5441d5c9ea2b (patch)
treeee42ff7378fd2433cb88e1cfa25b2a65035b0c43 /include/istream
parent527d9fcb66574fdd657c3235c0d7cba7c5439d5c (diff)
downloadsrc-1c9014238e909c768bf84564733b5441d5c9ea2b.tar.gz
src-1c9014238e909c768bf84564733b5441d5c9ea2b.zip
Pull new libc++ into vendor branch.vendor/libc++/r185801
Notes
Notes: svn path=/vendor/libc++/dist/; revision=253146 svn path=/vendor/libc++/r185801/; revision=253147; tag=vendor/libc++/r185801
Diffstat (limited to 'include/istream')
-rw-r--r--include/istream6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/istream b/include/istream
index 3f629f68008c..f3e74c382e6b 100644
--- a/include/istream
+++ b/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;
}
}