Changeset 392 for trunk/src/io

Timestamp:

06/11/15 16:23:41 (10 years ago)

Author:

epyon

Message:

• massive shift towards nova STL
• include cleanups

File:

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

trunk/src/io/string_table.cc

@@ -6 +6 @@
 
 #include "nv/io/string_table.hh"
-#include <array>
 
 nv::string_table_creator::string_table_creator()
@@ -24 +23 @@
         NV_ASSERT( m_offsets.size() < index(-1), "Too many strings!" );
         index  result  = (index)m_offsets.size();
-        m_offsets.push_back( m_data.size() );
-        std::copy( cs, cs + cs_size, std::back_inserter( m_data ) );
+        size_t dsize = m_data.size();
+        m_offsets.push_back( dsize );
+        m_data.resize( dsize + cs_size );
+        raw_copy( cs, cs + cs_size, m_data.data() + dsize );
         m_map[ s ] = result;
         return result;
@@ -34 +35 @@
         offset* offsets = new offset[m_offsets.size()];
         char*   data    = new char [m_data.size()];
-        std::copy( m_offsets.begin(), m_offsets.end(), offsets );
-        std::copy( m_data.begin(),    m_data.end(),    data );
+        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() );
 }