From b8c9712f60a0b30ee79f633e21da7f537fa747ec Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 29 Apr 2022 13:29:07 -0400 Subject: [PATCH] Silence warnings from Sacado in user projects. --- include/deal.II/base/numbers.h | 2 ++ include/deal.II/base/utilities.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h index 9e73871ca0..2f7f9fe1f5 100644 --- a/include/deal.II/base/numbers.h +++ b/include/deal.II/base/numbers.h @@ -142,7 +142,9 @@ DEAL_II_NAMESPACE_CLOSE // import the whole Sacado header at this point to get the math // functions imported into the standard namespace. #ifdef DEAL_II_TRILINOS_WITH_SACADO +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif namespace std diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h index 09699322f7..a003facbe3 100644 --- a/include/deal.II/base/utilities.h +++ b/include/deal.II/base/utilities.h @@ -28,6 +28,8 @@ #include #include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + #ifdef DEAL_II_WITH_TRILINOS # include # include @@ -40,8 +42,6 @@ # endif #endif -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS - #include #include #include -- 2.39.5