From: David Wells Date: Fri, 29 Apr 2022 17:29:07 +0000 (-0400) Subject: Silence warnings from Sacado in user projects. X-Git-Tag: v9.4.0-rc1~292^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13659%2Fhead;p=dealii.git Silence warnings from Sacado in user projects. --- 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