From 84a8e4d43606a96543275ed73550e85a3305ddf2 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Fri, 31 May 2024 16:52:20 -0500 Subject: [PATCH] ENH: Default to allow ITK_MACROEND_NOOP_STATEMENT The ITK_MACROEND_NOOP_STATEMENT is always supported in compilers, and allows macros to be used with semi-colons without warnings or clang-format inconsistencies. --- Modules/Core/Common/include/itkMacro.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h index d5e590248b30..52691b52c531 100644 --- a/Modules/Core/Common/include/itkMacro.h +++ b/Modules/Core/Common/include/itkMacro.h @@ -80,17 +80,7 @@ namespace itk * */ #define ITK_NOOP_STATEMENT static_assert(true, "") - -#if defined(ITK_FUTURE_LEGACY_REMOVE) - -# define ITK_MACROEND_NOOP_STATEMENT ITK_NOOP_STATEMENT -#else -/* NOTE: The ITK_MACROEND_NOOP_STATEMENT must be defined to nothing - * in order to maintain backwards compatibility with earlier macro - * uses that may or may not have ';' after the macro is used. */ -/* Purposefully empty */ -# define ITK_MACROEND_NOOP_STATEMENT -#endif +#define ITK_MACROEND_NOOP_STATEMENT ITK_NOOP_STATEMENT // clang-format on // Define ITK_PRAGMA macro.