summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-02-02 17:37:16 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-02-02 17:37:16 +0000
commitda3b02fdb3cfa7ba6e7edbdf00ac9db6d6b55bbe (patch)
tree24b75a95dc752dabb7d1c152bbf99030153ff31e /libcxx
parent72c5e14203eb73f5368821f1caa5912c2dd90d91 (diff)
downloadbcm5719-llvm-da3b02fdb3cfa7ba6e7edbdf00ac9db6d6b55bbe.tar.gz
bcm5719-llvm-da3b02fdb3cfa7ba6e7edbdf00ac9db6d6b55bbe.zip
Missing traits::to_int_type in fstream
llvm-svn: 124727
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/include/fstream8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/fstream b/libcxx/include/fstream
index 5734aa07297..809a4971d17 100644
--- a/libcxx/include/fstream
+++ b/libcxx/include/fstream
@@ -579,7 +579,7 @@ basic_filebuf<_CharT, _Traits>::underflow()
this->setg(this->eback(),
this->eback() + __unget_sz,
this->eback() + __unget_sz + __nmemb);
- __c = *this->gptr();
+ __c = traits_type::to_int_type(*this->gptr());
}
}
else
@@ -602,18 +602,18 @@ basic_filebuf<_CharT, _Traits>::underflow()
if (__r == codecvt_base::noconv)
{
this->setg((char_type*)__extbuf_, (char_type*)__extbuf_, (char_type*)__extbufend_);
- __c = *this->gptr();
+ __c = traits_type::to_int_type(*this->gptr());
}
else if (__inext != this->eback() + __unget_sz)
{
this->setg(this->eback(), this->eback() + __unget_sz, __inext);
- __c = *this->gptr();
+ __c = traits_type::to_int_type(*this->gptr());
}
}
}
}
else
- __c = *this->gptr();
+ __c = traits_type::to_int_type(*this->gptr());
if (this->eback() == &__1buf)
this->setg(0, 0, 0);
return __c;
OpenPOWER on IntegriCloud