mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support non-trivially-copyable items in Vector.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-13 02:20:31 +01:00
parent 08642d034b
commit d854998856
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/TracyVector.hpp
View File

@ -4,6 +4,7 @@
#include <assert.h> #include <assert.h>
#include <limits> #include <limits>
#include <stdint.h> #include <stdint.h>
#include <type_traits>
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"
#include "TracyMemory.hpp" #include "TracyMemory.hpp"
@ -280,7 +281,17 @@ private:
T* ptr = new T[CapacityNoNullptrCheck()]; T* ptr = new T[CapacityNoNullptrCheck()];
if( m_size != 0 ) if( m_size != 0 )
{ {
memcpy( ptr, m_ptr, m_size * sizeof( T ) ); if( std::is_trivially_copyable<T>() )
{
memcpy( ptr, m_ptr, m_size * sizeof( T ) );
}
else
{
for( uint32_t i=0; i<m_size; i++ )
{
ptr[i] = std::move( m_ptr[i] );
}
}
delete[] m_ptr; delete[] m_ptr;
} }
m_ptr = ptr; m_ptr = ptr;