mirror of
https://github.com/thunderbrewhq/squall.git
synced 2025-12-12 02:22:30 +00:00
fix(array): use copy constructor and call destructors appropriately
This commit is contained in:
parent
3492f8b8f2
commit
955a0bbba7
2 changed files with 31 additions and 7 deletions
|
|
@ -53,8 +53,7 @@ void TSFixedArray<T>::ReallocData(uint32_t count) {
|
|||
|
||||
if (count < this->m_count) {
|
||||
for (uint32_t i = count; i < this->m_count; i++) {
|
||||
T* element = &this->m_data[i];
|
||||
delete element;
|
||||
(&this->m_data[i])->~T();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -70,11 +69,8 @@ void TSFixedArray<T>::ReallocData(uint32_t count) {
|
|||
uint32_t smallestCount = count >= this->m_count ? this->m_count : count;
|
||||
|
||||
for (uint32_t i = 0; i < smallestCount; i++) {
|
||||
T* v8 = &this->m_data[i];
|
||||
|
||||
if (v8) {
|
||||
*v8 = oldData[i];
|
||||
}
|
||||
new (&this->m_data[i]) T(oldData[i]);
|
||||
(&oldData[i])->~T();
|
||||
}
|
||||
|
||||
SMemFree(oldData, nullptr, 0, 0x0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue