summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/JUtility/JUTAssert.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 6d01dd5a..f71c17f0 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -4,11 +4,7 @@
#include "dolphin/types.h"
#include "dolphin/os/OS.h"
-#define JUT_ASSERT(LINE, COND) \
- if ((COND) == 0) { \
- JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND); \
- OSPanic(__FILE__, LINE, "Halt"); \
- }
+#define JUT_ASSERT(LINE, COND) (void)((COND) || (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND), OSPanic(__FILE__, LINE, "Halt"), 0));
// Favored by JAI (JAudio)
#define JUT_ASSERT_MSG(LINE, COND, MSG) \
@@ -20,14 +16,6 @@
} \
}
-// Some asserts on floats have the wrong codegen with JUT_ASSERT's (COND) == 0 check.
-// Using !(COND) instead fixes them.
-#define JUT_ASSERT_FLOAT(LINE, COND) \
- if (!(COND)) { \
- JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND); \
- OSPanic(__FILE__, LINE, "Halt"); \
- }
-
#define JUT_PANIC(LINE) \
JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, "0"); \
OSPanic(__FILE__, LINE, "Halt");