Changeset 198 for trunk/src/io/std_stream.cc
- Timestamp:
- 08/11/13 17:19:03 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/io/std_stream.cc
r138 r198 15 15 : m_stream( source ) 16 16 , m_owner( owner ) 17 , m_buffer( std::max(bsize, put_back) + put_back ) 17 18 , m_put_back( std::max( put_back, std::size_t( 1 ) ) ) 18 , m_buffer( std::max(bsize, put_back) + put_back )19 19 { 20 20 char *end = &m_buffer.front() + m_buffer.size(); … … 49 49 50 50 // start is now the start of the buffer, proper. 51 size_t n = m_stream->read( start, 1, m_buffer.size() - (start - base) );51 size_t n = m_stream->read( start, 1, m_buffer.size() - static_cast<size_t>(start - base) ); 52 52 if (n == 0) 53 53 {
Note: See TracChangeset
for help on using the changeset viewer.