diff --git a/nac3core/irrt/irrt/debug.hpp b/nac3core/irrt/irrt/debug.hpp index f5baea7a..effff3eb 100644 --- a/nac3core/irrt/irrt/debug.hpp +++ b/nac3core/irrt/irrt/debug.hpp @@ -10,14 +10,18 @@ #define raise_debug_assert(SizeT, msg, param1, param2, param3) \ raise_exception(SizeT, EXN_ASSERTION_ERROR, "IRRT debug assert failed: " msg, param1, param2, param3); -#define debug_assert_eq(SizeT, lhs, rhs) \ - if (IRRT_DEBUG_ASSERT_BOOL && (lhs) != (rhs)) \ - { \ - raise_debug_assert(SizeT, "LHS = {0}. RHS = {1}", lhs, rhs, NO_PARAM); \ +#define debug_assert_eq(SizeT, lhs, rhs) if constexpr (IRRT_DEBUG_ASSERT_BOOL) +{ + if ((lhs) != (rhs)) + { + raise_debug_assert(SizeT, "LHS = {0}. RHS = {1}", lhs, rhs, NO_PARAM); } +} -#define debug_assert(SizeT, expr) \ - if (IRRT_DEBUG_ASSERT_BOOL && !(expr)) \ - { \ - raise_debug_assert(SizeT, "Got false.", NO_PARAM, NO_PARAM, NO_PARAM); \ - } \ No newline at end of file +#define debug_assert(SizeT, expr) if constexpr (IRRT_DEBUG_ASSERT_BOOL) +{ + if (!(expr)) + { + raise_debug_assert(SizeT, "Got false.", NO_PARAM, NO_PARAM, NO_PARAM); + } +} \ No newline at end of file