diff options
| author |  Liam | 2022-10-13 11:01:28 -0400 |
|---|---|---|
| committer | Liam | 2022-10-13 12:10:39 -0400 |
| commit | c0fb5e876d83abae86d64a19d4acfb9867ed7dc1 (patch) | |
| tree | 78e06a23b051df24c2c834ae093f563fe1de97ce /src/core | |
| parent | Merge pull request #9034 from liamwhite/result-macros (diff) | |
| download | yuzu-c0fb5e876d83abae86d64a19d4acfb9867ed7dc1.tar.gz yuzu-c0fb5e876d83abae86d64a19d4acfb9867ed7dc1.tar.xz yuzu-c0fb5e876d83abae86d64a19d4acfb9867ed7dc1.zip | |
result: enforce reference check specialization
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/result.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index e20e0bfee..d67e68bae 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -402,9 +402,8 @@ constexpr bool EvaluateResultFailure(const Result& r) { | |||
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | template <typename T> | 404 | template <typename T> |
| 405 | constexpr void UpdateCurrentResultReference(T result_reference, Result result) { | 405 | constexpr void UpdateCurrentResultReference(T result_reference, Result result) = delete; |
| 406 | ASSERT(false); | 406 | // Intentionally not defined |
| 407 | } | ||
| 408 | 407 | ||
| 409 | template <> | 408 | template <> |
| 410 | constexpr void UpdateCurrentResultReference<Result&>(Result& result_reference, Result result) { | 409 | constexpr void UpdateCurrentResultReference<Result&>(Result& result_reference, Result result) { |
| @@ -412,7 +411,7 @@ constexpr void UpdateCurrentResultReference<Result&>(Result& result_reference, R | |||
| 412 | } | 411 | } |
| 413 | 412 | ||
| 414 | template <> | 413 | template <> |
| 415 | constexpr void UpdateCurrentResultReference<Result>(Result result_reference, Result result) {} | 414 | constexpr void UpdateCurrentResultReference<const Result>(Result result_reference, Result result) {} |
| 416 | } // namespace ResultImpl | 415 | } // namespace ResultImpl |
| 417 | 416 | ||
| 418 | #define DECLARE_CURRENT_RESULT_REFERENCE_AND_STORAGE(COUNTER_VALUE) \ | 417 | #define DECLARE_CURRENT_RESULT_REFERENCE_AND_STORAGE(COUNTER_VALUE) \ |