diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2020-12-01 13:01:30 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2020-12-01 13:01:30 +0000 |
| commit | d93e024adecb376b16885ef64e5a3062a1b7e298 (patch) | |
| tree | af14215347f409991262c02dbd1345b298028f26 | |
| parent | 7b4a213603a1d64083bfc8396ee32ea840b3f058 (diff) | |
"Merge Tagged PR 1340"mainline-0-454
| -rw-r--r-- | src/common/assert.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/common/assert.h b/src/common/assert.h index 06d7b5612b..48c09b530b 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -29,22 +29,19 @@ assert_noinline_call(const Fn& fn) { } #define ASSERT(_a_) \ - do \ - if (!(_a_)) { \ - assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \ - } \ - while (0) + if (!(_a_)) { \ + LOG_CRITICAL(Debug, "Assertion Failed!"); \ + } #define ASSERT_MSG(_a_, ...) \ - do \ - if (!(_a_)) { \ - assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ - } \ - while (0) + if (!(_a_)) { \ + LOG_CRITICAL(Debug, "Assertion Failed! " __VA_ARGS__); \ + } -#define UNREACHABLE() assert_noinline_call([] { LOG_CRITICAL(Debug, "Unreachable code!"); }) +#define UNREACHABLE() \ + { LOG_CRITICAL(Debug, "Unreachable code!"); } #define UNREACHABLE_MSG(...) \ - assert_noinline_call([&] { LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); }) + { LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); } #ifdef _DEBUG #define DEBUG_ASSERT(_a_) ASSERT(_a_) |