Merge commit '44fd329b021bfd46a6b033a64467cda7d40310db' into lite

This commit is contained in:
tqchen 2015-04-19 00:23:02 -07:00
commit ee112353cb

View File

@ -345,13 +345,13 @@ inline int ostream::OutBuf::sync(void) {
if (stream_ == NULL) return -1; if (stream_ == NULL) return -1;
std::ptrdiff_t n = pptr() - pbase(); std::ptrdiff_t n = pptr() - pbase();
stream_->Write(pbase(), n); stream_->Write(pbase(), n);
this->pbump(-n); this->pbump(-static_cast<int>(n));
return 0; return 0;
} }
inline int ostream::OutBuf::overflow(int c) { inline int ostream::OutBuf::overflow(int c) {
*(this->pptr()) = c; *(this->pptr()) = c;
std::ptrdiff_t n = pptr() - pbase(); std::ptrdiff_t n = pptr() - pbase();
this->pbump(-n); this->pbump(-static_cast<int>(n));
if (c == EOF) { if (c == EOF) {
stream_->Write(pbase(), n); stream_->Write(pbase(), n);
} else { } else {