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

[ox/std] Cleanup more unnecessary copies and add new variants of oxRequire

Browse Source
This commit is contained in:
Gary Talent 2021-04-16 19:53:02 -05:00
parent 90d9a0a8b0
commit 6a566ed35e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,10 +67,10 @@ struct [[nodiscard]] Result {
constexpr Result() noexcept: error(0) {
}
constexpr Result(Error error) noexcept: error(error) {
constexpr Result(const Error &error) noexcept: error(error) {
}
constexpr Result(T value, Error error = OxError(0)) noexcept: value(ox::move(value)), error(error) {
constexpr Result(T value, const Error &error = OxError(0)) noexcept: value(ox::move(value)), error(error) {
}
explicit constexpr operator const T&() const noexcept {
@ -81,7 +81,8 @@ struct [[nodiscard]] Result {
return value;
}
[[nodiscard]] constexpr bool ok() const noexcept {
[[nodiscard]]
constexpr bool ok() const noexcept {
return error == 0;
}
@ -122,6 +123,11 @@ inline void oxIgnoreError(ox::Error) noexcept {}
#endif
#define oxConcatImpl(a, b) a##b
#define oxConcat(a, b) oxConcatImpl(a, b)
#define oxRequire(out, x) auto [out, oxConcat(oxRequire_err_, __LINE__)] = x; oxReturnError(oxConcat(oxRequire_err_, __LINE__))
#define oxRequireT(out, x) auto [out, oxConcat(oxRequire_err_, __LINE__)] = x; oxThrowError(oxConcat(oxRequire_err_, __LINE__))
// oxRequire Mutable
#define oxRequireM(out, x) auto [out, oxConcat(oxRequire_err_, __LINE__)] = x; oxReturnError(oxConcat(oxRequire_err_, __LINE__))
#define oxRequire(out, x) const oxRequireM(out, x)
// oxRequire Mutable Throw
#define oxRequireMT(out, x) auto [out, oxConcat(oxRequire_err_, __LINE__)] = x; oxThrowError(oxConcat(oxRequire_err_, __LINE__))
// oxRequire Throw
#define oxRequireT(out, x) const oxRequireMT(out, x)