drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/std] Fix another inappropriate assign with constructor

Browse Source
This commit is contained in:
Gary Talent 2021-07-31 04:05:56 -05:00
parent 8480eeba0c
commit 90b2e7a43c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/std/vector.hpp vendored
View File

@ -531,7 +531,7 @@ void Vector<T, SmallVectorSize>::insert(std::size_t pos, const T &val) {
expandCap(m_cap ? m_cap * 2 : 100); expandCap(m_cap ? m_cap * 2 : 100);
} }
for (auto i = m_size; i > pos; --i) { for (auto i = m_size; i > pos; --i) {
m_items[i] = move(m_items[i - 1]); new (&m_items[i]) T(move(m_items[i - 1]));
} }
m_items[pos] = val; m_items[pos] = val;
++m_size; ++m_size;
@ -599,7 +599,7 @@ void Vector<T, SmallVectorSize>::expandCap(std::size_t cap) {
if (oldItems) { // move over old items if (oldItems) { // move over old items
const auto itRange = cap > m_size ? m_size : cap; const auto itRange = cap > m_size ? m_size : cap;
for (std::size_t i = 0; i < itRange; i++) { for (std::size_t i = 0; i < itRange; i++) {
m_items[i] = move(oldItems[i]); new (&m_items[i]) T(move(oldItems[i]));
} }
this->clearItems(bit_cast<AllocAlias<T>*>(oldItems)); this->clearItems(bit_cast<AllocAlias<T>*>(oldItems));
} }