diff options
| author | Martin Hořeňovský | 2024-04-30 21:08:35 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2024-04-30 23:51:36 +0200 |
| commit | fa5a53df17303339eff8fda5cae0b601af207085 (patch) | |
| tree | ebfb2cdaf2c90e74985b9549c7f6c6c6292941e2 | |
| parent | a654e4b0382f3c41bdb911739b05276a11cf644a (diff) | |
| download | catch3-fa5a53df17303339eff8fda5cae0b601af207085.tar.gz | |
Explicitly silence Wnon-virtual-dtor in Decomposer and MatchExpr
Closes #2854
| -rw-r--r-- | CMake/CatchMiscFunctions.cmake | 1 | ||||
| -rw-r--r-- | src/catch2/internal/catch_decomposer.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/internal/catch_matchers_impl.hpp | 17 |
3 files changed, 20 insertions, 0 deletions
diff --git a/CMake/CatchMiscFunctions.cmake b/CMake/CatchMiscFunctions.cmake index 84bd7cc7..05bc83c0 100644 --- a/CMake/CatchMiscFunctions.cmake +++ b/CMake/CatchMiscFunctions.cmake @@ -68,6 +68,7 @@ function(add_warnings_to_targets targets) "-Wmissing-noreturn" "-Wmissing-prototypes" "-Wmissing-variable-declarations" + "-Wnon-virtual-dtor" "-Wnull-dereference" "-Wold-style-cast" "-Woverloaded-virtual" diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp index 41365b70..7962c9ef 100644 --- a/src/catch2/internal/catch_decomposer.hpp +++ b/src/catch2/internal/catch_decomposer.hpp @@ -110,9 +110,11 @@ #ifdef __clang__ # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wsign-compare" +# pragma clang diagnostic ignored "-Wnon-virtual-dtor" #elif defined __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wsign-compare" +# pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif #if defined(CATCH_CPP20_OR_GREATER) && __has_include(<compare>) diff --git a/src/catch2/matchers/internal/catch_matchers_impl.hpp b/src/catch2/matchers/internal/catch_matchers_impl.hpp index 2ee9f0c0..8d013fa2 100644 --- a/src/catch2/matchers/internal/catch_matchers_impl.hpp +++ b/src/catch2/matchers/internal/catch_matchers_impl.hpp @@ -18,6 +18,16 @@ namespace Catch { +#ifdef __clang__ +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wsign-compare" +# pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#elif defined __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wsign-compare" +# pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#endif + template<typename ArgT, typename MatcherT> class MatchExpr : public ITransientExpression { ArgT && m_arg; @@ -36,6 +46,13 @@ namespace Catch { } }; +#ifdef __clang__ +# pragma clang diagnostic pop +#elif defined __GNUC__ +# pragma GCC diagnostic pop +#endif + + namespace Matchers { template <typename ArgT> class MatcherBase; |