Merge pull request #8300 from Morph1984/resultval-range

hle/result: Add ResultRange overload in ResultVal

1 files changed, 4 insertions, 2 deletions

diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 8d38d0030..569dd9f38 100644
--- 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 <typename U>
     constexpr ResultVal(U&& val) : expected{std::forward<U>(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<T, ResultCode> expected;
 };