From 9eea9289b1c4316d5856d1cb9602ee463d7de989 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 28 Sep 2025 16:11:07 -0400 Subject: Fix JUT_ASSERT and several other macros (#2711) * Fix JUT_ASSERT to be a nested define * Switch names that appear in asserts to be constants instead of defines * Replace `0` in asserts with `NULL` or `FALSE` * Fix fpclassify * Fix ARRAY_SIZE * Use G_CM3D_F_INF * More fixes for fpclassify * Remove FLOAT_LABEL * Remove incorrect FLAG_ON macro * Remove UNK_BSS macro * Silence clangd unused header warning for PCH --- src/d/d_msg_string_base.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/d/d_msg_string_base.cpp') diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 8b9c1a62b2..253a87e781 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -2,7 +2,7 @@ // d_msg_string_base // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_string_base.h" #include "d/d_msg_class.h" @@ -16,17 +16,17 @@ dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; getResource(); mpResCont = new JMessage::TResourceContainer(); - JUT_ASSERT(33, mpResCont != 0); + JUT_ASSERT(33, mpResCont != NULL); mpCtrl = new jmessage_string_tControl(); - JUT_ASSERT(36, mpCtrl != 0); + JUT_ASSERT(36, mpCtrl != NULL); mpRefer = new jmessage_string_tReference(); - JUT_ASSERT(39, mpRefer != 0); + JUT_ASSERT(39, mpRefer != NULL); mpSeqProc = new jmessage_string_tSequenceProcessor(mpRefer, mpCtrl); - JUT_ASSERT(42, mpSeqProc != 0); + JUT_ASSERT(42, mpSeqProc != NULL); mpRenProc = new jmessage_string_tRenderingProcessor(mpRefer); - JUT_ASSERT(45, mpRenProc != 0); + JUT_ASSERT(45, mpRenProc != NULL); mpParse = new JMessage::TParse(mpResCont); - JUT_ASSERT(48, mpParse != 0); + JUT_ASSERT(48, mpParse != NULL); mpRefer->setResourceContainer(mpResCont); mpCtrl->setSequenceProcessor(mpSeqProc); mpCtrl->setRenderingProcessor(mpRenProc); -- cgit v1.2.3