aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryuzubot <yuzu@yuzu-emu.org>2020-06-05 02:38:26 +0000
committeryuzubot <yuzu@yuzu-emu.org>2020-06-05 02:38:26 +0000
commit7d030bc27f9bd375f1f65286e4dabdf2f5472bf4 (patch)
treef13edd505dd792107b5f4f2ebd22d1a29a6e93aa /src
parenta55f81a97a9278c503118df29e57d2007a351acb (diff)
"Merge Tagged PR 1340"mainline-0-272
Diffstat (limited to 'src')
-rw-r--r--src/common/assert.h21
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_)