diff options
Diffstat (limited to 'src/core/hle/result.h')
| -rw-r--r-- | src/core/hle/result.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 450f61fea..b6bdbd988 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -342,8 +342,9 @@ ResultVal<std::remove_reference_t<Arg>> MakeResult(Arg&& arg) { | |||
| 342 | */ | 342 | */ |
| 343 | #define CASCADE_RESULT(target, source) \ | 343 | #define CASCADE_RESULT(target, source) \ |
| 344 | auto CONCAT2(check_result_L, __LINE__) = source; \ | 344 | auto CONCAT2(check_result_L, __LINE__) = source; \ |
| 345 | if (CONCAT2(check_result_L, __LINE__).Failed()) \ | 345 | if (CONCAT2(check_result_L, __LINE__).Failed()) { \ |
| 346 | return CONCAT2(check_result_L, __LINE__).Code(); \ | 346 | return CONCAT2(check_result_L, __LINE__).Code(); \ |
| 347 | } \ | ||
| 347 | target = std::move(*CONCAT2(check_result_L, __LINE__)) | 348 | target = std::move(*CONCAT2(check_result_L, __LINE__)) |
| 348 | 349 | ||
| 349 | /** | 350 | /** |
| @@ -351,6 +352,9 @@ ResultVal<std::remove_reference_t<Arg>> MakeResult(Arg&& arg) { | |||
| 351 | * non-success, or discarded otherwise. | 352 | * non-success, or discarded otherwise. |
| 352 | */ | 353 | */ |
| 353 | #define CASCADE_CODE(source) \ | 354 | #define CASCADE_CODE(source) \ |
| 354 | auto CONCAT2(check_result_L, __LINE__) = source; \ | 355 | do { \ |
| 355 | if (CONCAT2(check_result_L, __LINE__).IsError()) \ | 356 | auto CONCAT2(check_result_L, __LINE__) = source; \ |
| 356 | return CONCAT2(check_result_L, __LINE__); | 357 | if (CONCAT2(check_result_L, __LINE__).IsError()) { \ |
| 358 | return CONCAT2(check_result_L, __LINE__); \ | ||
| 359 | } \ | ||
| 360 | } while (false) | ||