diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/core/StarStaticVector.hpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/core/StarStaticVector.hpp')
-rw-r--r-- | source/core/StarStaticVector.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/core/StarStaticVector.hpp b/source/core/StarStaticVector.hpp index 18ddaae..91a2e41 100644 --- a/source/core/StarStaticVector.hpp +++ b/source/core/StarStaticVector.hpp @@ -116,7 +116,7 @@ template <typename Element, size_t MaxSize> StaticVector<Element, MaxSize>::StaticVector(StaticVector&& other) : StaticVector() { for (auto& e : other) - emplace_back(move(e)); + emplace_back(std::move(e)); } template <typename Element, size_t MaxSize> @@ -163,7 +163,7 @@ template <typename Element, size_t MaxSize> auto StaticVector<Element, MaxSize>::operator=(StaticVector&& other) -> StaticVector& { resize(other.size()); for (size_t i = 0; i < m_size; ++i) - operator[](i) = move(other[i]); + operator[](i) = std::move(other[i]); return *this; } @@ -172,7 +172,7 @@ template <typename Element, size_t MaxSize> auto StaticVector<Element, MaxSize>::operator=(std::initializer_list<Element> list) -> StaticVector& { resize(list.size()); for (size_t i = 0; i < m_size; ++i) - operator[](i) = move(list[i]); + operator[](i) = std::move(list[i]); return *this; } @@ -275,7 +275,7 @@ Element* StaticVector<Element, MaxSize>::ptr() { template <typename Element, size_t MaxSize> void StaticVector<Element, MaxSize>::push_back(Element e) { - emplace_back(move(e)); + emplace_back(std::move(e)); } template <typename Element, size_t MaxSize> @@ -288,7 +288,7 @@ void StaticVector<Element, MaxSize>::pop_back() { template <typename Element, size_t MaxSize> auto StaticVector<Element, MaxSize>::insert(iterator pos, Element e) -> iterator { - emplace(pos, move(e)); + emplace(pos, std::move(e)); return pos; } @@ -303,7 +303,7 @@ auto StaticVector<Element, MaxSize>::insert(iterator pos, Iterator begin, Iterat resize(m_size + toAdd); for (size_t i = toShift; i != 0; --i) - operator[](endIndex + i - 1) = move(operator[](startIndex + i - 1)); + operator[](endIndex + i - 1) = std::move(operator[](startIndex + i - 1)); for (size_t i = 0; i != toAdd; ++i) operator[](startIndex + i) = *begin++; @@ -322,8 +322,8 @@ void StaticVector<Element, MaxSize>::emplace(iterator pos, Args&&... args) { size_t index = pos - ptr(); resize(m_size + 1); for (size_t i = m_size - 1; i != index; --i) - operator[](i) = move(operator[](i - 1)); - operator[](index) = Element(forward<Args>(args)...); + operator[](i) = std::move(operator[](i - 1)); + operator[](index) = Element(std::forward<Args>(args)...); } template <typename Element, size_t MaxSize> @@ -333,7 +333,7 @@ void StaticVector<Element, MaxSize>::emplace_back(Args&&... args) { throw StaticVectorSizeException::format("StaticVector::emplace_back would extend StaticVector beyond size {}", MaxSize); m_size += 1; - new (ptr() + m_size - 1) Element(forward<Args>(args)...); + new (ptr() + m_size - 1) Element(std::forward<Args>(args)...); } template <typename Element, size_t MaxSize> @@ -346,7 +346,7 @@ template <typename Element, size_t MaxSize> auto StaticVector<Element, MaxSize>::erase(iterator pos) -> iterator { size_t index = pos - ptr(); for (size_t i = index; i < m_size - 1; ++i) - operator[](i) = move(operator[](i + 1)); + operator[](i) = std::move(operator[](i + 1)); resize(m_size - 1); return pos; } @@ -357,7 +357,7 @@ auto StaticVector<Element, MaxSize>::erase(iterator begin, iterator end) -> iter size_t endIndex = end - ptr(); size_t toRemove = endIndex - startIndex; for (size_t i = endIndex; i < m_size; ++i) - operator[](startIndex + (i - endIndex)) = move(operator[](i)); + operator[](startIndex + (i - endIndex)) = std::move(operator[](i)); resize(m_size - toRemove); return begin; } |