Changeset 438 for trunk/nv/stl/container/growing_storage.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/container/growing_storage.hh (modified) (3 diffs)

trunk/nv/stl/container/growing_storage.hh

@@ -112 +112 @@
                 inline growing_storage& operator=( growing_storage&& other )
                 {
-                        Storage::reallocate( 0, false );
-                        m_size = other.m_size;
-                        Storage::operator=( nv::move( other ) );
-                        other.m_size = size_impl_type();
+                        if ( this != &other )
+                        {
+                                m_size = other.m_size;
+                                Storage::operator=( nv::move( other ) );
+                                other.m_size = size_impl_type();
+                        }
                         return *this;
                 }
@@ -179 +181 @@
                 void insert( iterator position, const value_type& value )
                 {
-                        iterator iend = Storage::data() + m_size;
+                        ptrdiff_t offset = position - Storage::data();
                         if ( try_grow( 1 ) )
                         {
-                                raw_alias_copy( position, iend, position + 1 );
-                                copy_construct_object( position, value );
+                                iterator iposition = Storage::data() + offset;
+                                iterator iend = Storage::data() + m_size - 1;
+                                raw_alias_copy( iposition, iend, iposition + 1 );
+                                copy_construct_object( iposition, value );
                         }
                 }
@@ -192 +196 @@
                         // TODO: distance can't be called on destructive iterators - check 
                         //   and use pushback if needed?
-                        iterator iend = Storage::data() + m_size;
+                        ptrdiff_t offset = position - Storage::data();
                         size_type d = distance( first, last );
                         if ( try_grow( d ) )
                         {
-                                raw_alias_copy( position, iend, position + d );
-                                InitializePolicy::copy( first, last, position );
+                                iterator iposition = Storage::data() + offset;
+                                iterator iend = Storage::data() + m_size - d;
+                                raw_alias_copy( iposition, iend, iposition + d );
+                                InitializePolicy::copy( first, last, iposition );
                         }
                 }