drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox] Fix compiler warnings

Browse Source
This commit is contained in:
Gary Talent
2022-05-21 16:17:32 -05:00
parent 062fa07f4d
commit f2ddd15d63
8 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,6 +337,8 @@ class Vector: detail::VectorAllocator<T, SmallVectorSize> {
[[nodiscard]]
constexpr bool contains(const T&) const;
constexpr void insert(std::size_t pos, std::size_t cnt, const T &val);
constexpr void insert(std::size_t pos, const T &val);
template<typename... Args>
@@ -564,6 +566,25 @@ constexpr bool Vector<T, SmallVectorSize>::contains(const T &v) const {
return false;
}
template<typename T, std::size_t SmallVectorSize>
constexpr void Vector<T, SmallVectorSize>::insert(std::size_t pos, std::size_t cnt, const T &val) {
// TODO: insert should ideally have its own expandCap
if (m_size + cnt > m_cap) {
expandCap(m_cap ? m_size + cnt : initialSize);
}
if (pos < m_size) {
for (auto i = m_size + cnt - 1; i > pos; --i) {
std::construct_at(&m_items[i], std::move(m_items[i - cnt]));
}
m_items[pos] = val;
} else {
for (auto i = 0u; i < cnt; ++i) {
std::construct_at(&m_items[pos + i], val);
}
}
++m_size;
}
template<typename T, std::size_t SmallVectorSize>
constexpr void Vector<T, SmallVectorSize>::insert(std::size_t pos, const T &val) {
// TODO: insert should ideally have its own expandCap