diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2020-06-05 12:01:09 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2020-06-05 12:01:09 +0000 |
| commit | 45453f6eba81344879f63f5d8534ce6732c103ed (patch) | |
| tree | f13edd505dd792107b5f4f2ebd22d1a29a6e93aa | |
| parent | 4a7a8cb79b5f5df35e2661b6ce9e5e574f9d044d (diff) | |
"Merge Tagged PR 1340"mainline-0-273
| -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 5b67c5c527..a2b3ba3ddd 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -28,22 +28,19 @@ __declspec(noinline, noreturn) } #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_) |