From 97886f42f6ee12adc8b8ba0702aca5a91dcd0017 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 22 Jun 2020 15:30:19 -0400 Subject: [PATCH] Use DEAL_II_DISABLE_EXTRA_DIAGNOSTICS instead --- include/deal.II/matrix_free/matrix_free.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 71c02cecf9..62bc69bf8c 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -207,12 +207,9 @@ public: color = internal::MatrixFreeFunctions::TaskInfo::color }; - // clang-format off - // Remove with level_mg_handler -#ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA - _Pragma("GCC diagnostic push") - _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#endif + // remove with level_mg_handler + DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + /** * Constructor for AdditionalData. */ @@ -272,9 +269,9 @@ public: , cell_vectorization_categories_strict( other.cell_vectorization_categories_strict) {} -#ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA - _Pragma("GCC diagnostic pop") -#endif + + // remove with level_mg_handler + DEAL_II_ENABLE_EXTRA_DIAGNOSTICS /** * Copy assignment. @@ -303,7 +300,6 @@ public: return *this; } - // clang-format on /** * Set the scheme for task parallelism. There are four options available. -- 2.39.5