Index: trunk/src/io/c_stream.cc
===================================================================
--- trunk/src/io/c_stream.cc	(revision 395)
+++ trunk/src/io/c_stream.cc	(revision 406)
@@ -31,5 +31,5 @@
 	if ( m_file )
 	{
-		::fclose( (FILE*)m_file );
+		::fclose( reinterpret_cast<FILE*>( m_file ) );
 	}
 }
@@ -38,5 +38,5 @@
 {
 	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,15 +44,15 @@
 {
 	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,5 +72,5 @@
 			return 0; 
 		}
-		m_file_size = (size_t) (fstat.st_size); 		
+		m_file_size = static_cast<size_t>(fstat.st_size); 		
 	}
 
@@ -82,5 +82,5 @@
 	if ( m_file != nullptr )
 	{
-		::fflush( (FILE*)m_file );
+		::fflush( reinterpret_cast<FILE*>( m_file ) );
 	}
 }
Index: trunk/src/io/string_table.cc
===================================================================
--- trunk/src/io/string_table.cc	(revision 395)
+++ trunk/src/io/string_table.cc	(revision 406)
@@ -22,5 +22,5 @@
 	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,10 +37,10 @@
 	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 );