diff options
| author | Lioncash <mathew1800@gmail.com> | 2021-05-31 04:15:49 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2021-05-31 16:41:00 -0400 |
| commit | 3aed797466f6ba166a8e941c47687a345bca7576 (patch) | |
| tree | 18ed4fcc2073a1228e9f2bf7e05bbf7ae7188a96 /src/common/common_funcs.h | |
| parent | 519ddfae04c7f1f2225c91e33edcf7a86b20e9c2 (diff) | |
common_funcs: Move R_ macros to result.h
These macros all interact with the result code type, so they should
ideally be within this file as well, so all the common_funcs machinery
doesn't need to be pulled in just to use them.
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 17d1ee86b3..53bd7da608 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -97,17 +97,6 @@ __declspec(dllimport) void __stdcall DebugBreak(void); return static_cast<T>(key) == 0; \ } -/// Evaluates a boolean expression, and returns a result unless that expression is true. -#define R_UNLESS(expr, res) \ - { \ - if (!(expr)) { \ - if (res.IsError()) { \ - LOG_ERROR(Kernel, "Failed with result: {}", res.raw); \ - } \ - return res; \ - } \ - } - #define YUZU_NON_COPYABLE(cls) \ cls(const cls&) = delete; \ cls& operator=(const cls&) = delete @@ -116,20 +105,6 @@ __declspec(dllimport) void __stdcall DebugBreak(void); cls(cls&&) = delete; \ cls& operator=(cls&&) = delete -#define R_SUCCEEDED(res) (res.IsSuccess()) - -/// Evaluates an expression that returns a result, and returns the result if it would fail. -#define R_TRY(res_expr) \ - { \ - const auto _tmp_r_try_rc = (res_expr); \ - if (_tmp_r_try_rc.IsError()) { \ - return _tmp_r_try_rc; \ - } \ - } - -/// Evaluates a boolean expression, and succeeds if that expression is true. -#define R_SUCCEED_IF(expr) R_UNLESS(!(expr), RESULT_SUCCESS) - namespace Common { [[nodiscard]] constexpr u32 MakeMagic(char a, char b, char c, char d) { |