Silence warnings from Sacado in user projects.

diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h
index 9e73871ca099cbecab25563c29bb4e98c1c29f74..2f7f9fe1f53994dc2c94e31999d7c91c32d4ea59 100644 (file)
--- 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 <Sacado.hpp>
+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 09699322f7aed87e37385adb10fb41fec2277423..a003facbe3951091336f6ee3131d838a6bf503d4 100644 (file)
--- a/include/deal.II/base/utilities.h
+++ b/include/deal.II/base/utilities.h
@@ -28,6 +28,8 @@
 #include <utility>
 #include <vector>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 #ifdef DEAL_II_WITH_TRILINOS
 #  include <Epetra_Comm.h>
 #  include <Epetra_Map.h>
@@ -40,8 +42,6 @@
 #  endif
 #endif
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/core/demangle.hpp>