diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-09-16 10:17:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-16 20:17:56 +0300 |
| commit | 76b94a8916b98879820e514b7243ec779e3c25c0 (patch) | |
| tree | 3710ab6c2bc2c982e1d28485c253e77c6b6a79d8 /include/JSystem/JUtility | |
| parent | 3d8048edba50aa4faa845954992a0ec8dd844960 (diff) | |
fix/simplify assert macros (#1929)
Diffstat (limited to 'include/JSystem/JUtility')
| -rw-r--r-- | include/JSystem/JUtility/JUTAssert.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 219ef76eea..2107956567 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -4,18 +4,18 @@ #include "dolphin/types.h" #if DEBUG -#define JUT_ASSERT(FILE, LINE, COND) \ - if (!COND) { \ - JUTAssertion::showAssert(JUTAssertion::getSDevice(), FILE, LINE, #COND); \ - OSPanic(FILE, LINE, "Halt"); \ +#define JUT_ASSERT(LINE, COND) \ + if ((COND) == 0) { \ + JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND); \ + OSPanic(__FILE__, LINE, "Halt"); \ } -#define JUT_PANIC(FILE, LINE, TEXT) \ - JUTAssertion::showAssert(JUTAssertion::getSDevice(), FILE, LINE, TEXT); \ - OSPanic(FILE, LINE, "Halt"); +#define JUT_PANIC(LINE, TEXT) \ + JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, TEXT); \ + OSPanic(__FILE__, LINE, "Halt"); -#define JUT_WARN(FILE, LINE, ...) \ - JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), FILE, LINE, __VA_ARGS__) +#define JUT_WARN(LINE, ...) \ + JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__); \ #define JUT_LOG(LINE, ...) \ JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__) |