summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__std_stream
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-12-01 20:21:04 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-12-01 20:21:04 +0000
commitc206366fd7774aff222578c2680b931a4c2c35ba (patch)
tree754a1c9a558a9c1e4e1774aec8ac5268ba3d2afe /libcxx/include/__std_stream
parentab0ad4ed1eea577056d76a4b76734dae881955d3 (diff)
downloadbcm5719-llvm-c206366fd7774aff222578c2680b931a4c2c35ba.tar.gz
bcm5719-llvm-c206366fd7774aff222578c2680b931a4c2c35ba.zip
Quash a whole bunch of warnings
llvm-svn: 145624
Diffstat (limited to 'libcxx/include/__std_stream')
-rw-r--r--libcxx/include/__std_stream8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream
index 7fe34d49d98..e562e2c4730 100644
--- a/libcxx/include/__std_stream
+++ b/libcxx/include/__std_stream
@@ -25,7 +25,7 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-static const unsigned __limit = 8;
+static const int __limit = 8;
// __stdinbuf
@@ -104,7 +104,7 @@ __stdinbuf<_CharT>::__getchar(bool __consume)
int __nread = _VSTD::max(1, __encoding_);
for (int __i = 0; __i < __nread; ++__i)
{
- char __c = getc(__file_);
+ int __c = getc(__file_);
if (__c == EOF)
return traits_type::eof();
__extbuf[__i] = static_cast<char>(__c);
@@ -131,7 +131,7 @@ __stdinbuf<_CharT>::__getchar(bool __consume)
if (__nread == sizeof(__extbuf))
return traits_type::eof();
{
- char __c = getc(__file_);
+ int __c = getc(__file_);
if (__c == EOF)
return traits_type::eof();
__extbuf[__nread] = static_cast<char>(__c);
@@ -268,7 +268,7 @@ __stdoutbuf<_CharT>::overflow(int_type __c)
if (__r == codecvt_base::partial)
{
this->setp((char_type*)__e, this->pptr());
- this->pbump(this->epptr() - this->pbase());
+ this->pbump(static_cast<int>(this->epptr() - this->pbase()));
}
}
else
OpenPOWER on IntegriCloud