mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tracy::Vector::insert().

Browse Source
This commit is contained in:
Bartosz Taudul 2017-09-25 23:01:22 +02:00
parent b33b9fd4ed
commit f39c2d5e70
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/TracyVector.hpp
View File

@ -76,22 +76,26 @@ public:
m_ptr[m_size++] = std::move( v ); m_ptr[m_size++] = std::move( v );
} }
void insert( T* it, const T& v ) T* insert( T* it, const T& v )
{ {
assert( it >= m_ptr && it <= m_ptr + m_size ); assert( it >= m_ptr && it <= m_ptr + m_size );
const auto dist = it - m_ptr;
if( m_size == m_capacity ) AllocMore(); if( m_size == m_capacity ) AllocMore();
if( it != m_ptr + m_size ) memmove( it+1, it, ( m_size - ( it - m_ptr ) ) * sizeof( T ) ); if( dist != m_size ) memmove( m_ptr + dist + 1, m_ptr + dist, ( m_size - dist ) * sizeof( T ) );
m_size++; m_size++;
*it = v; m_ptr[dist] = v;
return m_ptr + dist;
} }
void insert( T* it, T&& v ) T* insert( T* it, T&& v )
{ {
assert( it >= m_ptr && it <= m_ptr + m_size ); assert( it >= m_ptr && it <= m_ptr + m_size );
const auto dist = it - m_ptr;
if( m_size == m_capacity ) AllocMore(); if( m_size == m_capacity ) AllocMore();
if( it != m_ptr + m_size ) memmove( it+1, it, ( m_size - ( it - m_ptr ) ) * sizeof( T ) ); if( dist != m_size ) memmove( m_ptr + dist + 1, m_ptr + dist, ( m_size - dist ) * sizeof( T ) );
m_size++; m_size++;
*it = std::move( v ); m_ptr[dist] = std::move( v );
return m_ptr + dist;
} }
private: private: