summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryuzubot <yuzu@yuzu-emu.org>2019-09-26 12:01:27 +0000
committeryuzubot <yuzu@yuzu-emu.org>2019-09-26 12:01:27 +0000
commite33a1bace0a92da6ef3b8862837528ba8ae9ad04 (patch)
tree5c0464ebb98ce56cd5c43275e5c688e896200b77
parent8fb8fce9f48e409487a0647ce900fd0db6acf08d (diff)
"Merge PR 1340"
-rw-r--r--src/common/assert.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/common/assert.h b/src/common/assert.h
index 4b0e3f64ee..be73a7e1ba 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__)