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

[ox] Cleanup some old style error handling

Browse Source
This commit is contained in:
Gary Talent
2021-04-17 11:33:33 -05:00
parent 6664462391
commit a22823e3b4
10 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
deps/ox/src/ox/std/error.hpp vendored
View File

@ -59,7 +59,7 @@ struct [[nodiscard]] Error {
template<typename T>
struct [[nodiscard]] Result {
using type = T;
using type = typename ox::remove_reference<T>::type;
T value;
Error error;
@ -70,14 +70,17 @@ struct [[nodiscard]] Result {
constexpr Result(const Error &error) noexcept: error(error) {
}
constexpr Result(T value, const Error &error = OxError(0)) noexcept: value(ox::move(value)), error(error) {
constexpr Result(const type &value, const Error &error = OxError(0)) noexcept: value(const_cast<type&>(value)), error(error) {
}
explicit constexpr operator const T&() const noexcept {
constexpr Result(type &&value, const Error &error = OxError(0)) noexcept: value(ox::move(value)), error(error) {
}
explicit constexpr operator const type&() const noexcept {
return value;
}
explicit constexpr operator T&() noexcept {
explicit constexpr operator type&() noexcept {
return value;
}
@ -86,12 +89,12 @@ struct [[nodiscard]] Result {
return error == 0;
}
constexpr Error get(T *val) noexcept {
constexpr Error get(type *val) noexcept {
*val = value;
return error;
}
constexpr Error moveTo(T *val) noexcept {
constexpr Error moveTo(type *val) noexcept {
*val = ox::move(value);
return error;
}