Changeset 406 for trunk/src/io

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

Location:

trunk/src/io

Files:

• c_stream.cc (modified) (5 diffs)
• string_table.cc (modified) (2 diffs)

trunk/src/io/c_stream.cc

@@ -31 +31 @@
         if ( m_file )
         {
-                ::fclose( (FILE*)m_file );
+                ::fclose( reinterpret_cast<FILE*>( m_file ) );
         }
 }
@@ -38 +38 @@
 {
         NV_ASSERT( buffer != nullptr && size != 0 && count != 0, "Bad parameter passed to read!" );
-        return m_file ? ::fread( buffer, size, count, (FILE*)m_file ) : 0;
+        return m_file ? ::fread( buffer, size, count, reinterpret_cast<FILE*>( m_file ) ) : 0;
 }
 
@@ -44 +44 @@
 {
         NV_ASSERT( buffer != nullptr && size != 0 && count != 0, "Bad parameter passed to write!" );
-        return m_file ? ::fwrite( buffer, size, count, (FILE*)m_file ) : 0;
+        return m_file ? ::fwrite( buffer, size, count, reinterpret_cast<FILE*>( m_file ) ) : 0;
 }
 
 bool c_stream::seek( long offset, origin orig )
 {
-        return m_file != nullptr && ( ::fseek( (FILE*)m_file, (long)offset, static_cast<int>(orig) ) == 0 );
+        return m_file != nullptr && ( ::fseek( reinterpret_cast<FILE*>( m_file ), offset, static_cast<int>(orig) ) == 0 );
 }
 
 nv::size_t c_stream::tell()
 {
-        return m_file != nullptr ? static_cast< nv::size_t >( ::ftell( (FILE*)m_file ) ) : 0;
+        return m_file != nullptr ? static_cast< nv::size_t >( ::ftell( reinterpret_cast<FILE*>( m_file ) ) ) : 0;
 }
 
@@ -72 +72 @@
                         return 0; 
                 }
-                m_file_size = (size_t) (fstat.st_size);                 
+                m_file_size = static_cast<size_t>(fstat.st_size);               
         }
 
@@ -82 +82 @@
         if ( m_file != nullptr )
         {
-                ::fflush( (FILE*)m_file );
+                ::fflush( reinterpret_cast<FILE*>( m_file ) );
         }
 }

trunk/src/io/string_table.cc

@@ -22 +22 @@
         uint32 cs_size = s.size() + 1;
         NV_ASSERT( m_offsets.size() < index(-1), "Too many strings!" );
-        index  result  = (index)m_offsets.size();
+        index  result = index( m_offsets.size() );
         size_t dsize = m_data.size();
         m_offsets.push_back( dsize );
@@ -37 +37 @@
         raw_copy( m_offsets.begin(), m_offsets.end(), offsets );
         raw_copy( m_data.begin(),    m_data.end(),    data );
-        return new string_table( data, m_data.size(), offsets, (index)m_offsets.size() );
+        return new string_table( data, m_data.size(), offsets, index( m_offsets.size() ) );
 }
 
 void nv::string_table_creator::dump( nv::stream* out ) const
 {
-        index  count = (index)m_offsets.size();
+        index  count = index( m_offsets.size() );
         uint32 size  = m_data.size();
         out->write( &count,  sizeof( count ), 1 );