From e30bfacdf1f28abb355db5aa3a15390df17eedb8 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 4 May 2022 03:33:10 +0200 Subject: [PATCH] early-access version 2720 --- README.md | 2 +- src/core/hle/result.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ca9f52afb..03dbe776e 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2719. +This is the source code for early-access 2720. ## Legal Notice diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 8d38d0030..569dd9f38 100755 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -181,7 +181,7 @@ public: consteval ResultRange(ErrorModule module, u32 description_start, u32 description_end_) : code{module, description_start}, description_end{description_end_} {} - [[nodiscard]] consteval operator ResultCode() const { + [[nodiscard]] constexpr operator ResultCode() const { return code; } @@ -232,6 +232,8 @@ public: constexpr ResultVal(ResultCode code) : expected{Common::Unexpected(code)} {} + constexpr ResultVal(ResultRange range) : expected{Common::Unexpected(range)} {} + template constexpr ResultVal(U&& val) : expected{std::forward(val)} {} @@ -317,7 +319,7 @@ public: } private: - // TODO: Replace this with std::expected once it is standardized in the STL. + // TODO (Morph): Replace this with C++23 std::expected. Common::Expected expected; };