Просмотр исходного кода

hle/result: Add ResultRange overload in ResultVal

Also marks the implicit conversion operator as constexpr instead of consteval as the constructor is not constant evaluated.
Morph 4 лет назад
Родитель
Сommit
f3f3f1b7d9
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      src/core/hle/result.h

+ 3 - 1
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)} {}