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

[ox] Remove OxError

Browse Source
This commit is contained in:
Gary Talent
2024-12-13 22:06:47 -06:00
parent 9881253f2a
commit 345fb03857
57 changed files with 383 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,7 +439,7 @@ constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::at(size_t i) noexcep
if (i < size()) [[likely]] {
return &operator[](i);
}
return OxError(1, "Vector: Invalid index");
return ox::Error(1, "Vector: Invalid index");
}
template<typename T, std::size_t SmallVectorSize, typename Allocator>
@@ -447,13 +447,13 @@ constexpr Result<T const*> Vector<T, SmallVectorSize, Allocator>::at(size_t i) c
if (i < size()) [[likely]] {
return &operator[](i);
}
return OxError(1, "Vector: Invalid index");
return ox::Error(1, "Vector: Invalid index");
}
template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::front() noexcept {
if (!m_size) {
return {nullptr, OxError(1)};
return {nullptr, ox::Error(1)};
}
return &m_items[0];
}
@@ -461,7 +461,7 @@ constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::front() noexcept {
template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Result<const T*> Vector<T, SmallVectorSize, Allocator>::front() const noexcept {
if (!m_size) {
return {nullptr, OxError(1)};
return {nullptr, ox::Error(1)};
}
return &m_items[0];
}
@@ -469,7 +469,7 @@ constexpr Result<const T*> Vector<T, SmallVectorSize, Allocator>::front() const
template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::back() noexcept {
if (!m_size) {
return {nullptr, OxError(1)};
return {nullptr, ox::Error(1)};
}
return &m_items[m_size - 1];
}
@@ -477,7 +477,7 @@ constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::back() noexcept {
template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Result<const T*> Vector<T, SmallVectorSize, Allocator>::back() const noexcept {
if (!m_size) {
return {nullptr, OxError(1)};
return {nullptr, ox::Error(1)};
}
return &m_items[m_size - 1];
}
@@ -634,7 +634,7 @@ template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Result<typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>>
Vector<T, SmallVectorSize, Allocator>::erase(std::size_t pos) noexcept(useNoexcept) {
if (pos >= m_size) {
return OxError(1, "Vector::erase failed: pos is greater than Vector size");
return ox::Error(1, "Vector::erase failed: pos is greater than Vector size");
}
--m_size;
for (auto i = pos; i < m_size; ++i) {
@@ -648,12 +648,12 @@ template<typename T, std::size_t SmallVectorSize, typename Allocator>
constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size_t pos)
noexcept(useNoexcept) {
if (pos >= m_size) {
return OxError(1);
return ox::Error(1);
}
--m_size;
m_items[pos] = std::move(m_items[m_size]);
m_items[m_size].~T();
return OxError(0);
return ox::Error(0);
}
template<typename T, std::size_t SmallVectorSize, typename Allocator>