diff options
| author | Leitwolf11 | 2026-09-29 17:45:59 +0300 |
|---|---|---|
| committer | Leitwolf11 | 2026-09-29 17:45:59 +0300 |
| commit | 1f2ec07fdfe05af6df9a573f2c16551e91eef3a6 (patch) | |
| tree | 5343fc2573e70ba4a5ca81ab4a1d19e0012c7453 /src | |
| parent | bf6f0aba4b5fc4ee47a3dd99650993494b26e090 (diff) | |
| download | catch3-1f2ec07fdfe05af6df9a573f2c16551e91eef3a6.tar.gz | |
Backport upstream range-header and Clang diagnostic fixes
Review Catch2 devel through 222e233903d287cda4713fb08e1a959e8d71fd6d. Add the direct cassert dependency to the range generator and preserve the upstream Clang pointer-to-bool diagnostic boundary in reusable streams. Record reviewed upstream revisions without changing compiler options, licensing, or fork-owned APIs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/generators/catch_generators_range.hpp | 1 | ||||
| -rw-r--r-- | src/catch2/internal/catch_reusable_string_stream.hpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/catch2/generators/catch_generators_range.hpp b/src/catch2/generators/catch_generators_range.hpp index 62739b23..4d6bd1f5 100644 --- a/src/catch2/generators/catch_generators_range.hpp +++ b/src/catch2/generators/catch_generators_range.hpp @@ -10,6 +10,7 @@ #include <catch2/generators/catch_generators.hpp> +#include <cassert> #include <iterator> #include <type_traits> diff --git a/src/catch2/internal/catch_reusable_string_stream.hpp b/src/catch2/internal/catch_reusable_string_stream.hpp index 5b864f35..4fa9e5d1 100644 --- a/src/catch2/internal/catch_reusable_string_stream.hpp +++ b/src/catch2/internal/catch_reusable_string_stream.hpp @@ -39,6 +39,9 @@ namespace Catch { // be null... #pragma GCC diagnostic ignored "-Waddress" #pragma GCC diagnostic ignored "-Wnonnull-compare" +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpointer-bool-conversion" #endif template<typename T> @@ -49,6 +52,8 @@ namespace Catch { #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic pop +#elif defined(__clang__) +#pragma clang diagnostic pop #endif auto get() -> std::ostream& { return *m_oss; } }; |