From d124498ee5af7ac6b224768f7bb272765d9b5cb8 Mon Sep 17 00:00:00 2001 From: yuzubot Date: Sun, 15 Sep 2019 10:18:19 +0000 Subject: [PATCH] "Merge PR 1340" --- src/common/assert.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/common/assert.h b/src/common/assert.h index 4b0e3f64e..be73a7e1b 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -28,18 +28,14 @@ __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_MSG(false, "Unreachable code!") #define UNREACHABLE_MSG(...) ASSERT_MSG(false, __VA_ARGS__)