Merge pull request #9065 from liamwhite/result-mess

result: enforce reference check specialization
3 years ago · 2abc9f5f3d
1 changed files with 3 additions and 4 deletions
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@ -402,9 +402,8 @@ constexpr bool EvaluateResultFailure(const Result& r) {
 }

 template <typename T>
-constexpr void UpdateCurrentResultReference(T result_reference, Result result) {
-    ASSERT(false);
-}
+constexpr void UpdateCurrentResultReference(T result_reference, Result result) = delete;
+// Intentionally not defined

 template <>
 constexpr void UpdateCurrentResultReference<Result&>(Result& result_reference, Result result) {
@ -412,7 +411,7 @@ constexpr void UpdateCurrentResultReference<Result&>(Result& result_reference, R
 }

 template <>
-constexpr void UpdateCurrentResultReference<Result>(Result result_reference, Result result) {}
+constexpr void UpdateCurrentResultReference<const Result>(Result result_reference, Result result) {}
 } // namespace ResultImpl

 #define DECLARE_CURRENT_RESULT_REFERENCE_AND_STORAGE(COUNTER_VALUE)                                \