Skip to content

Commit 28de861

Browse files
authored
Merge pull request #4644 from InsightSoftwareConsortium/clang-suppress-followup
COMP: restored old spelling of CLANG_SUPPRESS_Wfloat_equal
2 parents 9b8963e + 0c67829 commit 28de861

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Modules/Core/Common/include/itkMacro.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,19 @@ namespace itk
118118

119119
// For Clang only (and not GCC):
120120
#if defined(__clang__) && defined(__has_warning)
121-
# define CLANG_PRAGMA_PUSH ITK_PRAGMA(clang diagnostic push)
122-
# define CLANG_PRAGMA_POP ITK_PRAGMA(clang diagnostic pop)
121+
# define ITK_CLANG_PRAGMA_PUSH ITK_PRAGMA(clang diagnostic push)
122+
# define ITK_CLANG_PRAGMA_POP ITK_PRAGMA(clang diagnostic pop)
123123
#else
124-
# define CLANG_PRAGMA_PUSH
125-
# define CLANG_PRAGMA_POP
124+
# define ITK_CLANG_PRAGMA_PUSH
125+
# define ITK_CLANG_PRAGMA_POP
126126
#endif
127127

128+
// These were not intended as public API, but some code was nevertheless using them.
129+
// Support the pre ITK 5.4 spelling for compatibility.
130+
#define CLANG_PRAGMA_PUSH ITK_CLANG_PRAGMA_PUSH
131+
#define CLANG_PRAGMA_POP ITK_CLANG_PRAGMA_POP
132+
#define CLANG_SUPPRESS_Wfloat_equal ITK_GCC_SUPPRESS_Wfloat_equal
133+
128134
#if !defined(ITK_LEGACY_REMOVE)
129135
// Issue warning if deprecated preprocessor flag is used.
130136
# define CLANG_SUPPRESS_Wcpp14_extensions \

0 commit comments

Comments
 (0)