diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-08-14 17:53:31 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-08-14 17:53:31 +0000 |
| commit | 3e005bf6b2649da693d6c3109b5947890a0ffec3 (patch) | |
| tree | 31c1184f7ae53f315de698f0e3dceafdfad1f365 /src/strstream.cpp | |
| parent | 811e7130db8918f2ba5b5a6745a7ec038c69639c (diff) | |
| download | external_libcxx-3e005bf6b2649da693d6c3109b5947890a0ffec3.tar.gz external_libcxx-3e005bf6b2649da693d6c3109b5947890a0ffec3.tar.bz2 external_libcxx-3e005bf6b2649da693d6c3109b5947890a0ffec3.zip | |
Fix signed/unsigned warnings when building libc++ in C++14 mode
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@188395 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src/strstream.cpp')
| -rw-r--r-- | src/strstream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/strstream.cpp b/src/strstream.cpp index 518422bd2..08a78a74f 100644 --- a/src/strstream.cpp +++ b/src/strstream.cpp @@ -156,13 +156,13 @@ strstreambuf::overflow(int_type __c) { if ((__strmode_ & __dynamic) == 0 || (__strmode_ & __frozen) != 0) return int_type(EOF); - streamsize old_size = (epptr() ? epptr() : egptr()) - eback(); - streamsize new_size = max<streamsize>(__alsize_, 2*old_size); + size_t old_size = static_cast<size_t> ((epptr() ? epptr() : egptr()) - eback()); + size_t new_size = max<size_t>(static_cast<size_t>(__alsize_), 2*old_size); if (new_size == 0) new_size = __default_alsize; char* buf = nullptr; if (__palloc_) - buf = static_cast<char*>(__palloc_(static_cast<size_t>(new_size))); + buf = static_cast<char*>(__palloc_(new_size)); else buf = new char[new_size]; if (buf == nullptr) |