Changeset 438 for trunk/nv/stl/string/short_string.hh

Timestamp:

07/23/15 17:29:49 (10 years ago)

Author:

epyon

Message:

• massive amount of std::string removal
• removed slurp, use filesystem::slurp instead
• lua_values const_string support
• several bugfixes
• program_manager and shader loading without std::string/std::stream

File:

• trunk/nv/stl/string/short_string.hh (modified) (5 diffs)

trunk/nv/stl/string/short_string.hh

@@ -10 +10 @@
 #include <nv/stl/string/common.hh>
 #include <nv/stl/string/string_base.hh>
+#include <nv/stl/string/string_twine.hh>
 #include <nv/stl/container/random_access.hh>
 #include <nv/stl/container/contiguous_storage.hh>
@@ -32 +33 @@
                 }
 
+
+                template < typename Base >
+                inline explicit string_buffer_base( const string_base< Base >& s ) : this_type( s.data(), s.size() ) {}
                 inline explicit string_buffer_base( const string_view& s ) : this_type( s.data(), s.size() ) {}
-                template < typename S >
-                inline string_buffer_base( const string_base<S>& rhs ) : this_type( rhs.data(), rhs.size() ) {}
+
+                inline string_buffer_base( const string_twine& twine )
+                {
+                        append( twine );
+                }
                 inline string_buffer_base( string_buffer_base&& copy ) = default;
                 inline string_buffer_base& operator=( string_buffer_base&& other ) = default;
-                inline string_buffer_base& operator=( const string_view& other )
-                {
-                        clear();
-                        append( other );
-                }
 
                 size_t append( const char* data, size_t sz )
@@ -49 +51 @@
                         raw_copy_n( data, amount, this->begin() + pos );
                         return amount;
+                }
+
+                size_t append( const string_twine& twine )
+                {
+                        size_t pos = size();
+                        size_t dump_size = twine.dump_size();
+                        expand_by( dump_size );
+                        twine.dump( array_ref< char >( data() + pos, size() - pos ) );
+                        return size() - pos;
                 }
 
@@ -111 +122 @@
                 void reserve( size_type new_capacity )
                 {
-                        Storage::reserve( new_capacity + 1, true );
+                        Storage::reserve( new_capacity + 1 );
                         this->data()[this->size()] = 0;
                 }
@@ -117 +128 @@
                 void resize( size_type new_size )
                 {
-                        Storage::reserve( new_size + 1, true );
+                        Storage::reserve( new_size + 1 );
                         Storage::resize( min( new_size, capacity() - 1 ) );
                         this->data()[this->size()] = 0;