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

[ox/std] Add another redundant check to suppress GCC's pedantry

Browse Source
This commit is contained in:
Gary Talent 2022-05-28 18:58:33 -05:00
parent bfb441594f
commit 440d9c0a46
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,13 @@ struct VectorAllocator {
} }
constexpr void moveConstructItemsFrom(T **items, VectorAllocator &src, const std::size_t count, const std::size_t cap) noexcept { constexpr void moveConstructItemsFrom(T **items, VectorAllocator &src, const std::size_t count, const std::size_t cap) noexcept {
if (cap <= Size) { // this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
// try removing it later
if (cap <= Size && count <= Size) {
const auto dstItems = reinterpret_cast<T*>(m_data); const auto dstItems = reinterpret_cast<T*>(m_data);
const auto srcItems = reinterpret_cast<T*>(src.m_data); const auto srcItems = reinterpret_cast<T*>(src.m_data);
for (auto i = 0u; i < count; ++i) { for (auto i = 0u; i < count; ++i) {
new (&dstItems[i]) T(std::move(srcItems[i])); std::construct_at<T>(&dstItems[i], std::move(srcItems[i]));
} }
*items = reinterpret_cast<T*>(m_data); *items = reinterpret_cast<T*>(m_data);
} }