Skip to content

Commit f51dc98

Browse files
abhishekbelgaonkar23ChrisThrasher
authored andcommitted
Fix: Clang 19 -Wc++20-extensions warning (#2910)
1 parent 76f70b1 commit f51dc98

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/catch2/internal/catch_compiler_capabilities.hpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,16 @@
103103
# define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
104104
_Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
105105

106-
# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
107-
_Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
106+
# if (__clang_major__ >= 20)
107+
# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
108+
_Pragma( "clang diagnostic ignored \"-Wvariadic-macro-arguments-omitted\"" )
109+
# elif (__clang_major__ == 19)
110+
# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
111+
_Pragma( "clang diagnostic ignored \"-Wc++20-extensions\"" )
112+
# else
113+
# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
114+
_Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
115+
# endif
108116

109117
# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
110118
_Pragma( "clang diagnostic ignored \"-Wunused-template\"" )

0 commit comments

Comments
 (0)