Changeset 406 for trunk/src/io/string_table.cc

Timestamp:

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

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/io/string_table.cc (modified) (2 diffs)

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 );