Skip to content

Commit e8fc103

Browse files
horenmarhorenmar
committed
Attempt at localized fix for warnings: doesn't work on old clang, doesn't work on Clang22
1 parent 2ec64d1 commit e8fc103

6 files changed

Lines changed: 53 additions & 27 deletions

File tree

‎src/catch2/internal/catch_compiler_capabilities.hpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@
114114
_Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
115115
# endif
116116

117+
# if ( __clang_major__ >= 22 )
118+
# define CATCH_INTERNAL_SUPPRESS_COUNTER_WARNINGS \
119+
_Pragma( "clang diagnostic ignored \"-Wc2y-extensions\"" )
120+
# endif
121+
117122
# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
118123
_Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
119124

@@ -429,6 +434,9 @@
429434
#if !defined( CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS )
430435
# define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS
431436
#endif
437+
#if !defined( CATCH_INTERNAL_SUPPRESS_COUNTER_WARNINGS )
438+
# define CATCH_INTERNAL_SUPPRESS_COUNTER_WARNINGS
439+
#endif
432440

433441
#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
434442
# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS

‎src/catch2/internal/catch_preprocessor.hpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ namespace Catch {
8080
#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
8181
#endif
8282

83-
#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
84-
#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
85-
8683
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
8784
#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>(Catch::Detail::priority_tag<1>{}))
8885
#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
@@ -217,10 +214,10 @@ namespace Catch {
217214
#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
218215
#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
219216
template<typename TestType> \
220-
void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
217+
void TestName::TestName<TestType>::test()
221218
#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
222219
template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
223-
void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
220+
void TestName::TestName<__VA_ARGS__>::test()
224221

225222
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
226223
#define INTERNAL_CATCH_NTTP_0

‎src/catch2/internal/catch_template_test_registry.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
2828
#define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
2929
namespace{ \
30-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) { \
30+
namespace TestName { \
3131
INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
3232
} \
3333
} \
@@ -77,7 +77,7 @@
7777
CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
7878
INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
7979
namespace {\
80-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
80+
namespace TestName {\
8181
INTERNAL_CATCH_TYPE_GEN\
8282
INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
8383
INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
@@ -124,7 +124,7 @@
124124
CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
125125
template<typename TestType> static void TestFuncName(); \
126126
namespace {\
127-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) { \
127+
namespace TestName { \
128128
INTERNAL_CATCH_TYPE_GEN \
129129
INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature)) \
130130
template<typename... Types> \
@@ -174,7 +174,7 @@
174174
CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
175175
template<typename TestType> static void TestFunc(); \
176176
namespace {\
177-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
177+
namespace TestName{\
178178
INTERNAL_CATCH_TYPE_GEN\
179179
template<typename... Types> \
180180
struct TestName { \
@@ -206,7 +206,7 @@
206206
CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
207207
CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
208208
namespace {\
209-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
209+
namespace TestName { \
210210
INTERNAL_CATCH_TYPE_GEN\
211211
INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
212212
INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
@@ -256,7 +256,7 @@
256256
void test();\
257257
};\
258258
namespace {\
259-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
259+
namespace TestNameClass {\
260260
INTERNAL_CATCH_TYPE_GEN \
261261
INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
262262
template<typename...Types>\
@@ -309,7 +309,7 @@
309309
void test();\
310310
};\
311311
namespace {\
312-
namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
312+
namespace INTERNAL_CATCH_UNIQUE_NAME(NsTestName) { \
313313
INTERNAL_CATCH_TYPE_GEN\
314314
template<typename...Types>\
315315
struct TestNameClass{\

‎src/catch2/internal/catch_unique_name.hpp‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,33 @@
88
#ifndef CATCH_UNIQUE_NAME_HPP_INCLUDED
99
#define CATCH_UNIQUE_NAME_HPP_INCLUDED
1010

11+
#include <catch2/internal/catch_compiler_capabilities.hpp>
1112
#include <catch2/internal/catch_config_counter.hpp>
13+
14+
// Fixme: Clang 22 has an annoying bug where the localized suppression
15+
// below does not actually suppress the extension warning from
16+
// using __COUNTER__, so we have to leak the suppression for the
17+
// whole TU. Hopefully Clang 23 fixes this before full release.
18+
// As AppleClang does its own thing version-wise, we ignore it
19+
// completely.
20+
#if defined( __clang__ ) && ( __clang_major__ >= 22 ) && !defined( __APPLE__ )
21+
CATCH_INTERNAL_SUPPRESS_COUNTER_WARNINGS
22+
#endif
23+
1224
#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
13-
#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
25+
#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) \
26+
INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
27+
1428
#ifdef CATCH_CONFIG_COUNTER
15-
# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
29+
# define INTERNAL_CATCH_UNIQUE_NAME( name ) \
30+
CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
31+
CATCH_INTERNAL_SUPPRESS_COUNTER_WARNINGS \
32+
INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) \
33+
CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
34+
1635
#else
17-
# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
36+
# define INTERNAL_CATCH_UNIQUE_NAME( name ) \
37+
INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
1838
#endif
1939

2040
#endif // CATCH_UNIQUE_NAME_HPP_INCLUDED

‎tests/SelfTest/UsageTests/Condition.tests.cpp‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
// SPDX-License-Identifier: BSL-1.0
88

9-
#ifdef __clang__
10-
# pragma clang diagnostic push
11-
# pragma clang diagnostic ignored "-Wpadded"
12-
// Wdouble-promotion is not supported until 3.8
13-
# if (__clang_major__ > 3) || (__clang_major__ == 3 && __clang_minor__ > 7)
14-
# pragma clang diagnostic ignored "-Wdouble-promotion"
15-
# endif
16-
#endif
17-
189
#include <catch2/catch_approx.hpp>
1910
#include <catch2/catch_test_macros.hpp>
2011

@@ -24,6 +15,16 @@ using Catch::Approx;
2415
#include <limits>
2516
#include <cstdint>
2617

18+
#ifdef __clang__
19+
# pragma clang diagnostic push
20+
# pragma clang diagnostic ignored "-Wpadded"
21+
// Wdouble-promotion is not supported until 3.8
22+
# if ( __clang_major__ > 3 ) || \
23+
( __clang_major__ == 3 && __clang_minor__ > 7 )
24+
# pragma clang diagnostic ignored "-Wdouble-promotion"
25+
# endif
26+
#endif
27+
2728
namespace {
2829

2930
struct TestData {

‎tests/SelfTest/UsageTests/Misc.tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,9 @@ TEMPLATE_PRODUCT_TEST_CASE_SIG("A Template product test case with array signatur
388388
REQUIRE(x.size() > 0);
389389
}
390390

391-
TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) {
392-
REQUIRE(std::tuple_size<TestType>::value >= 1);
393-
}
391+
//TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) {
392+
// REQUIRE(std::tuple_size<TestType>::value >= 1);
393+
//}
394394

395395
using MyTypes = std::tuple<int, char, float>;
396396
TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std::tuple", "[template][list]", MyTypes)

0 commit comments

Comments
 (0)