Changeset 198 for trunk/src/io

Timestamp:

08/11/13 17:19:03 (12 years ago)

Author:

epyon

Message:

• warning cleanup for clang and gcc

Location:

trunk/src/io

Files:

• c_stream.cc (modified) (2 diffs)
• std_stream.cc (modified) (2 diffs)

trunk/src/io/c_stream.cc

@@ -46 +46 @@
 }
 
-bool c_stream::seek( size_t offset, origin orig )
+bool c_stream::seek( long offset, origin orig )
 {
         return m_file != nullptr && ( ::fseek( (FILE*)m_file, (long)offset, static_cast<int>(orig) ) == 0 );
@@ -53 +53 @@
 size_t c_stream::tell()
 {
-        return m_file != nullptr ? ::ftell( (FILE*)m_file ) : 0;
+        return m_file != nullptr ? static_cast< size_t >( ::ftell( (FILE*)m_file ) ) : 0;
 }
 

trunk/src/io/std_stream.cc

@@ -15 +15 @@
         : m_stream( source )
         , m_owner( owner )
+        , m_buffer( std::max(bsize, put_back) + put_back )
         , m_put_back( std::max( put_back, std::size_t( 1 ) ) )
-        , m_buffer( std::max(bsize, put_back) + put_back )
 {
         char *end = &m_buffer.front() + m_buffer.size();
@@ -49 +49 @@
 
         // start is now the start of the buffer, proper.
-        size_t n = m_stream->read( start, 1, m_buffer.size() - (start - base) );
+        size_t n = m_stream->read( start, 1, m_buffer.size() - static_cast<size_t>(start - base) );
         if (n == 0)
         {