diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2020-06-12 12:01:09 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2020-06-12 12:01:09 +0000 |
| commit | 2bf866b57417ccde4b89f61da82d51b75594a055 (patch) | |
| tree | 24dd5bfb4674667b97e6e88adb4897b8a43deb5f | |
| parent | 82143c3e4c73fdb28952bd4d4f697e465e847a0a (diff) | |
"Merge Tagged PR 1340"mainline-0-280
| -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_) |