Remove all internal use of DEAL_II_DISABLE_EXTRA_DIAGNOSTICS

diff --git a/examples/step-33/step-33.cc b/examples/step-33/step-33.cc
index 3629f3cfe6a0b3818cb6618db39825253024a889..b98589bdc1f7407f8579b49e4c59571a7c6dca22 100644 (file)
--- a/examples/step-33/step-33.cc
+++ b/examples/step-33/step-33.cc
@@ -67,13 +67,7 @@
 
 // Sacado is the automatic differentiation package within Trilinos, which is
 // used to find the Jacobian for a fully implicit Newton iteration:
-// Trilinos::Sacado (at least until version 11.10.2) package will trigger
-// warnings when compiling this file. Since we are not responsible for this,
-// we just suppress the warning by wrapping the <code>#include</code>
-// directive into a pair of macros that simply suppress these warnings:
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Sacado.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 // And this again is C++:
 #include <iostream>

diff --git a/examples/step-53/step-53.cc b/examples/step-53/step-53.cc
index 3ffe45c1e9453b08f0ea58287b30b41306e14b09..d0a0b5608281bee20281d1800ce17bf848a963d6 100644 (file)
--- a/examples/step-53/step-53.cc
+++ b/examples/step-53/step-53.cc
@@ -39,16 +39,12 @@
 // the Functions::InterpolatedUniformGridData class that is declared in the
 // first of the following header files. Because the data is large, the file we
 // read from is stored as gzip compressed data and we make use of some
-// BOOST-provided functionality to read directly from gzipped data. We wrap
-// the BOOST includes with a preprocessor macro that disables certain annoying
-// compiler warnings.
+// BOOST-provided functionality to read directly from gzipped data.
 #include <deal.II/base/function_lib.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/iostreams/device/file.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <iostream>
 #include <fstream>

diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h
index e49c421b4b3362aeebd12397f5737dc8e583c0fe..717fd9662fd1f31ac94206efce3022cbab27b5a2 100644 (file)
--- a/include/deal.II/base/utilities.h
+++ b/include/deal.II/base/utilities.h
@@ -36,7 +36,6 @@
 #  endif
 #endif
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/serialization/vector.hpp>
@@ -48,7 +47,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/iostreams/device/back_inserter.hpp>
 #  include <boost/iostreams/filter/gzip.hpp>
 #endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/differentiation/ad/adolc_math.h b/include/deal.II/differentiation/ad/adolc_math.h
index 82f3cc6f2544626fc8cbe78e0ebca4ec13f8fcb5..c1036075e002cfb29b26de7bb0654013b930c7ec 100644 (file)
--- a/include/deal.II/differentiation/ad/adolc_math.h
+++ b/include/deal.II/differentiation/ad/adolc_math.h
@@ -20,13 +20,11 @@
 
 #ifdef DEAL_II_WITH_ADOLC
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <adolc/internal/adolc_settings.h>
 #include <adolc/internal/adubfunc.h> // Taped double math functions
 
 #include <adolc/adouble.h> // Taped double
 #include <adolc/adtl.h>    // Tapeless double
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 #ifndef DOXYGEN

diff --git a/include/deal.II/differentiation/ad/adolc_number_types.h b/include/deal.II/differentiation/ad/adolc_number_types.h
index 8dc56effebd32845c455f3f67e607209f9f5ff93..240730c5bf00ae98f989d7940b292bd2a0ed39e5 100644 (file)
--- a/include/deal.II/differentiation/ad/adolc_number_types.h
+++ b/include/deal.II/differentiation/ad/adolc_number_types.h
@@ -20,13 +20,11 @@
 
 #ifdef DEAL_II_WITH_ADOLC
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <adolc/internal/adolc_settings.h>
 #include <adolc/internal/adubfunc.h> // Taped double math functions
 
 #include <adolc/adouble.h> // Taped double
 #include <adolc/adtl.h>    // Tapeless double
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/differentiation/ad/adolc_product_types.h b/include/deal.II/differentiation/ad/adolc_product_types.h
index eb62f82dbaf99dac97e09e11c7458ef84cd741e5..ae608b82fca5c1c2bdfd65db9b7d6cb18f67048f 100644 (file)
--- a/include/deal.II/differentiation/ad/adolc_product_types.h
+++ b/include/deal.II/differentiation/ad/adolc_product_types.h
@@ -22,10 +22,8 @@
 
 #include <deal.II/base/template_constraints.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <adolc/adouble.h> // Taped double
 #include <adolc/adtl.h>    // Tapeless double
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/differentiation/ad/sacado_number_types.h b/include/deal.II/differentiation/ad/sacado_number_types.h
index b0cb3ed1757f93cf8dff58becbaaa04a666fc2b5..ac93c961bb37740128fac6f26080a778b66502a8 100644 (file)
--- a/include/deal.II/differentiation/ad/sacado_number_types.h
+++ b/include/deal.II/differentiation/ad/sacado_number_types.h
@@ -20,7 +20,6 @@
 
 #ifdef DEAL_II_WITH_TRILINOS
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Sacado.hpp>
 // It appears that some versions of Trilinos do not directly or indirectly
 // include all the headers for all forward and reverse Sacado AD types.
@@ -29,7 +28,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Sacado_Fad_DFad.hpp>
 // Reverse AD classes (templated)
 #include <Sacado_trad.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/differentiation/ad/sacado_product_types.h b/include/deal.II/differentiation/ad/sacado_product_types.h
index 1de5c404884f2606c2a70d4630b77e4b08ab0a92..6295a43f654bbd1be876d65c889d26a1bbcef3f6 100644 (file)
--- a/include/deal.II/differentiation/ad/sacado_product_types.h
+++ b/include/deal.II/differentiation/ad/sacado_product_types.h
@@ -23,7 +23,6 @@
 
 #ifdef DEAL_II_WITH_TRILINOS
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Sacado.hpp>
 // It appears that some versions of Trilinos do not directly or indirectly
 // include all the headers for all forward and reverse Sacado AD types.
@@ -32,7 +31,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <Sacado_Fad_DFad.hpp>
 // Reverse AD classes (templated)
 #include <Sacado_trad.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index af800ccfd0fbdcd25a0c7b1417bd40dce2be8c14..0cd6071e5774d063e8a61933afadd450189fec2e 100644 (file)
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -31,7 +31,6 @@
 #include <deal.II/hp/dof_handler.h>
 #include <deal.II/lac/sparsity_tools.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/optional.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
@@ -45,7 +44,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/iostreams/filter/gzip.hpp>
 #endif
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <bitset>
 #include <list>

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index 333c97545be63b306e4059a4abdaf47fcc6f632c..f35a5709b6463a70ba661004e2bc1e4656d2bd2a 100644 (file)
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -26,13 +26,11 @@
 #include <deal.II/grid/tria_iterator_selector.h>
 
 // Ignore deprecation warnings for auto_ptr.
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/signals2.hpp>
 #include <boost/serialization/vector.hpp>
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/unique_ptr.hpp>
 #include <boost/serialization/split_member.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <vector>
 #include <list>

diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index f4b167f06e5d562a3c5e54b45b003ab4829f9e49..be3d2e73db4201acf267d6866d9708b9a5d900a9 100644 (file)
--- a/include/deal.II/lac/precondition.h
+++ b/include/deal.II/lac/precondition.h
@@ -908,7 +908,6 @@ public:
   typedef types::global_dof_index size_type;
 
   // avoid warning about use of deprecated variables
-  DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
   /**
    * Standardized data struct to pipe additional parameters to the
@@ -999,7 +998,6 @@ public:
     std::shared_ptr<PreconditionerType> preconditioner;
   };
 
-  DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
   PreconditionChebyshev ();
 
@@ -1960,7 +1958,6 @@ namespace internal
 
 
 // avoid warning about deprecated variable nonzero_starting
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 template <typename MatrixType, class VectorType, typename PreconditionerType>
 inline
@@ -1980,7 +1977,6 @@ AdditionalData (const unsigned int degree,
   max_eigenvalue (max_eigenvalue)
 {}
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 template <typename MatrixType, typename VectorType, typename PreconditionerType>
@@ -1998,7 +1994,6 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::PreconditionChe
 
 
 // avoid warning about deprecated variable AdditionalData::matrix_diagonal_inverse
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 template <typename MatrixType, typename VectorType, typename PreconditionerType>
 inline
@@ -2035,7 +2030,6 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::clear ()
   data.preconditioner.reset();
 }
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 

diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index 7b1031b9ff03bf502f876dac2ac42db42ff4bc0c..a57e6c51e6c155ece1c487ceb462d8290b6157a8 100644 (file)
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -33,9 +33,7 @@
 #  include <deal.II/lac/trilinos_epetra_communication_pattern.h>
 #  include <deal.II/lac/trilinos_epetra_vector.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_MultiVector.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #endif
 

diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h
index 75cfc9ec55ef59b6219ea4917862bf27f7276584..0f27e74517c4354ecc5d59ff5fb2139ba4df9257 100644 (file)
--- a/include/deal.II/lac/read_write_vector.templates.h
+++ b/include/deal.II/lac/read_write_vector.templates.h
@@ -35,9 +35,7 @@
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/trilinos_epetra_vector.h>
 #  include <deal.II/lac/trilinos_epetra_communication_pattern.h>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #ifdef DEAL_II_WITH_CUDA

diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h
index 0d82993efacef040f6f24035ab7b557a56a3c8ff..df590543a0e00049fd316effc8b2f153441c85a5 100644 (file)
--- a/include/deal.II/lac/solver.h
+++ b/include/deal.II/lac/solver.h
@@ -22,9 +22,7 @@
 #include <deal.II/lac/solver_control.h>
 
 // Ignore deprecation warnings for auto_ptr.
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/signals2.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
index 129f123185c592df6cdd096fdee515072f7ac7e6..64695e31162e634a477ecd6805127f813ef36c11 100644 (file)
--- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h
+++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
@@ -25,9 +25,7 @@
 
 #include <deal.II/lac/communication_pattern_base.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <memory>
 

diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h
index 5aaa4d140ecad093e58185b1b65d823b7e038bcf..e0389cea355555d662ad16b6a3620ffa322b9ca2 100644 (file)
--- a/include/deal.II/lac/trilinos_epetra_vector.h
+++ b/include/deal.II/lac/trilinos_epetra_vector.h
@@ -29,10 +29,8 @@
 #include <deal.II/lac/vector_type_traits.h>
 #include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <mpi.h>
 #  include <Epetra_FEVector.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h
index a12605897a9d7530698ed9cfa668e79c7aaf4ccb..bbe9454b88f2d702f5690f7935d4725a429234bb 100644 (file)
--- a/include/deal.II/lac/trilinos_precondition.h
+++ b/include/deal.II/lac/trilinos_precondition.h
@@ -28,7 +28,6 @@
 
 #  include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  else
@@ -39,7 +38,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Teuchos_ParameterList.hpp>
 #  include <Epetra_RowMatrix.h>
 #  include <Epetra_Vector.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 // forward declarations
 class Ifpack_Preconditioner;

diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h
index 38d63ac5defcb6931dadb0fe26cecdd98882f784..3701b06aa9634882c28e89067d3e9c529e51b870 100644 (file)
--- a/include/deal.II/lac/trilinos_solver.h
+++ b/include/deal.II/lac/trilinos_solver.h
@@ -28,12 +28,10 @@
 
 #  include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_LinearProblem.h>
 #  include <AztecOO.h>
 #  include <Epetra_Operator.h>
 #  include <Amesos.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 0eac855c31c715ec7ab5ca41e52c3ff583433028..82ca8b2dfa00d4f06c0d4d2b678605f1cdef47e0 100644 (file)
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -35,7 +35,6 @@
 #  include <cmath>
 #  include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsMatrix.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_CrsGraph.h>
@@ -48,7 +47,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  else
 #    include <Epetra_SerialComm.h>
 #  endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 class Epetra_Export;
 

diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
index dc73ca78d0e9f3dd87bba1c2870011ef1fee54f5..5c7c85258450f012c7c13b2fa6c0b74081fb07a9 100644 (file)
--- a/include/deal.II/lac/trilinos_sparsity_pattern.h
+++ b/include/deal.II/lac/trilinos_sparsity_pattern.h
@@ -30,7 +30,6 @@
 #  include <memory>
 
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsGraph.h>
 #  include <Epetra_Map.h>
 #  ifdef DEAL_II_WITH_MPI
@@ -39,7 +38,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  else
 #    include <Epetra_SerialComm.h>
 #  endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index bb6066496d66e3dec3151b1b6235b05a44bad6a0..7f7ce9ffee7d75fcede200d94c9279def50e6705 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -33,7 +33,6 @@
 #  include <utility>
 #  include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_ConfigDefs.h>
 #  ifdef DEAL_II_WITH_MPI // only if MPI is installed
 #    include <mpi.h>
@@ -44,7 +43,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FEVector.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_LocalMap.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/multigrid/mg_coarse.h b/include/deal.II/multigrid/mg_coarse.h
index ee1098b8a8b66f540e5f77eee7527fe8e7e4e68f..8ada05f6bcb9d3264d9de109197a75bffd37b5a7 100644 (file)
--- a/include/deal.II/multigrid/mg_coarse.h
+++ b/include/deal.II/multigrid/mg_coarse.h
@@ -355,7 +355,6 @@ MGCoarseGridApplySmoother<VectorType>::operator() (const unsigned int level,
 
 /* ------------------ Functions for MGCoarseGridLACIteration ------------ */
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 template <typename SolverType, class VectorType>
 MGCoarseGridLACIteration<SolverType, VectorType>
@@ -445,7 +444,6 @@ MGCoarseGridLACIteration<SolverType, VectorType>
   matrix = linear_operator<VectorType>(LinearOperator<VectorType>(), m);
 }
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 /* ------------------ Functions for MGCoarseGridIterativeSolver ------------ */

diff --git a/include/deal.II/numerics/kdtree.h b/include/deal.II/numerics/kdtree.h
index 34cef87d79f3e168188c7ab5c8224859d0320074..3921eddf4d9e1827277ae7843fac26a415404d90 100644 (file)
--- a/include/deal.II/numerics/kdtree.h
+++ b/include/deal.II/numerics/kdtree.h
@@ -24,9 +24,7 @@
 
 #include <memory>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <nanoflann.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h
index bff05c59a218845bfb1f049727018bc5fed256c5..cffccbe0ce04ef64b5116e8db62cb5f3511751be 100644 (file)
--- a/include/deal.II/opencascade/utilities.h
+++ b/include/deal.II/opencascade/utilities.h
@@ -28,7 +28,6 @@
 #include <string>
 
 // opencascade needs "HAVE_CONFIG_H" to be exported...
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #define HAVE_CONFIG_H
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Face.hxx>
@@ -42,7 +41,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <IFSelect_ReturnStatus.hxx>
 #include <gp_Pnt.hxx>
 #undef HAVE_CONFIG_H
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 

diff --git a/source/base/function_parser.cc b/source/base/function_parser.cc
index 09c8449fed80bca604509fa67b1779ddd5297ef5..c94aa5e1219e2433428624aaa0971e06d8098217 100644 (file)
--- a/source/base/function_parser.cc
+++ b/source/base/function_parser.cc
@@ -21,15 +21,11 @@
 #include <cmath>
 #include <map>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/random.hpp>
 #include <boost/math/special_functions/erf.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #ifdef DEAL_II_WITH_MUPARSER
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <muParser.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #else
 
 

diff --git a/source/base/mpi.cc b/source/base/mpi.cc
index bea0ca2d616b15a76978260be29da66a3ad6ddc8..81ceef23932253aa8021a6b0f19e02eb57b4fd84 100644 (file)
--- a/source/base/mpi.cc
+++ b/source/base/mpi.cc
@@ -50,9 +50,7 @@
 #endif
 
 #ifdef DEAL_II_TRILINOS_WITH_ZOLTAN
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #   include <zoltan_cpp.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc
index 003351a81f6edbca837f5ccaaacd868dab691421..71c42099d24b3bd02eec805943b941de0f081f15 100644 (file)
--- a/source/base/parameter_handler.cc
+++ b/source/base/parameter_handler.cc
@@ -20,13 +20,11 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/utilities.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <boost/io/ios_state.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <fstream>
 #include <iostream>

diff --git a/source/base/patterns.cc b/source/base/patterns.cc
index bb7d3e64d2fea261d91e18e6566bcf883acbd10f..5dfe8239709d277685174808406d5e9a7a24a1ba 100644 (file)
--- a/source/base/patterns.cc
+++ b/source/base/patterns.cc
@@ -20,13 +20,11 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/utilities.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
 #include <boost/io/ios_state.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <fstream>
 #include <iostream>

diff --git a/source/base/polynomials_bernstein.cc b/source/base/polynomials_bernstein.cc
index 287adaf7c97f28cb9a3d34c6dcc560351e70bd3a..a5a7a288a1004b9d86923db1e9a5e99f9ab33faa 100644 (file)
--- a/source/base/polynomials_bernstein.cc
+++ b/source/base/polynomials_bernstein.cc
@@ -15,9 +15,7 @@
 
 #include <deal.II/base/polynomials_bernstein.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/math/special_functions/binomial.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <vector>
 

diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc
index e1b92b824ff8ffd50addf75a28f646d4ba8632ca..b6c125d0e5e5caf1963fcf68d2e9cc66ecc5c8cf 100644 (file)
--- a/source/base/symmetric_tensor.cc
+++ b/source/base/symmetric_tensor.cc
@@ -18,9 +18,7 @@
 // Required for instantiation of template functions
 #ifdef DEAL_II_WITH_TRILINOS
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Sacado.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <deal.II/differentiation/ad/sacado_product_types.h>
 #endif

diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index 983e1519a81e50d7675c5c4890b2d26a1245d57b..6a1f250b8d641019fa9b6303a41b109e990b468e 100644 (file)
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -27,11 +27,9 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/thread_local_storage.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/math/special_functions/erf.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/random.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <cctype>
@@ -55,7 +53,6 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #ifdef DEAL_II_WITH_TRILINOS
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
@@ -66,7 +63,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Teuchos_RCP.hpp>
 #  include <Epetra_SerialComm.h>
 #endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 

diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc
index a56e9a12b45b1dbb53c9e5a4955d718321587cb3..35132174b87dcf60666b3c9ab21cc506ad959850 100644 (file)
--- a/source/dofs/dof_handler_policy.cc
+++ b/source/dofs/dof_handler_policy.cc
@@ -30,7 +30,6 @@
 #include <deal.II/distributed/shared_tria.h>
 #include <deal.II/distributed/tria.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #ifdef DEAL_II_WITH_ZLIB
@@ -40,7 +39,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/serialization/array.hpp>
 #endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <set>
 #include <algorithm>

diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc
index 2ee6a6f8c818e9be727ffead510310823636a8d4..aba4838358ed278a459e588fa81fbaac0ac67a94 100644 (file)
--- a/source/dofs/dof_renumbering.cc
+++ b/source/dofs/dof_renumbering.cc
@@ -48,10 +48,8 @@
 #include <boost/graph/minimum_degree_ordering.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/graph/bandwidth.hpp>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/random.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <vector>
 #include <map>

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 80b58f2416dabba0de145d60a72a45f01f823bb6..eec85a4729a9271cb4a1a3c2004c7afdd2f56463 100644 (file)
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -35,11 +35,9 @@
 #endif
 
 #ifdef DEAL_II_WITH_ASSIMP
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <assimp/Importer.hpp>      // C++ importer interface
 #include <assimp/scene.h>           // Output data structure
 #include <assimp/postprocess.h>     // Post processing flags
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 

diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc
index 312357ff853964a4319ee1940908e5a6dcb6475d..e26b02aea4f3399fcaffa8bd43f0c31b40f6a4c7 100644 (file)
--- a/source/lac/sparsity_tools.cc
+++ b/source/lac/sparsity_tools.cc
@@ -32,18 +32,14 @@
 #endif
 
 #ifdef DEAL_II_WITH_METIS
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 extern "C"
 {
 #include <metis.h>
 }
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #ifdef DEAL_II_TRILINOS_WITH_ZOLTAN
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <zoltan_cpp.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #include <string>

diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc
index 93dc7b727a603edaa5d2a74c336a08276080da00..86c106cb07aae548485d3b683085bbd4d18633f0 100644 (file)
--- a/source/lac/trilinos_epetra_communication_pattern.cc
+++ b/source/lac/trilinos_epetra_communication_pattern.cc
@@ -21,9 +21,7 @@
 
 #include <deal.II/base/index_set.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Map.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <memory>
 

diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc
index 40ee86075dd4ae6e21d5317b7d1dc267c1ca814a..48328fb1a53efb6b57515485cadeeba9136f86b0 100644 (file)
--- a/source/lac/trilinos_epetra_vector.cc
+++ b/source/lac/trilinos_epetra_vector.cc
@@ -25,11 +25,9 @@
 
 #include <deal.II/lac/read_write_vector.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_MpiComm.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc
index d8cc956f8d04baafa325910f9b9b218b98736eab..ffca23affc5f3787ee00abbb830a85c6fcad0611 100644 (file)
--- a/source/lac/trilinos_precondition.cc
+++ b/source/lac/trilinos_precondition.cc
@@ -21,13 +21,11 @@
 #  include <deal.II/lac/sparse_matrix.h>
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Ifpack.h>
 #  include <Ifpack_Chebyshev.h>
 #  include <Teuchos_ParameterList.hpp>
 #  include <Teuchos_RCP.hpp>
 #  include <Epetra_MultiVector.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/lac/trilinos_precondition_ml.cc b/source/lac/trilinos_precondition_ml.cc
index 16fb391023d6f8a8c7c56024f89b85f4d5d45af0..f65ed6a18cb284485a5bd409b5ddfd48abe90571 100644 (file)
--- a/source/lac/trilinos_precondition_ml.cc
+++ b/source/lac/trilinos_precondition_ml.cc
@@ -23,7 +23,6 @@
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/trilinos_index_access.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Ifpack.h>
 #  include <Ifpack_Chebyshev.h>
 #  include <Teuchos_ParameterList.hpp>
@@ -31,7 +30,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_MultiVector.h>
 #  include <ml_include.h>
 #  include <ml_MultiLevelPreconditioner.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/lac/trilinos_precondition_muelu.cc b/source/lac/trilinos_precondition_muelu.cc
index b10c04d4620f3c2601c91389926c4c740ab5e854..ed5484cb46f8d17b7407ce107b5500800d22cf07 100644 (file)
--- a/source/lac/trilinos_precondition_muelu.cc
+++ b/source/lac/trilinos_precondition_muelu.cc
@@ -24,7 +24,6 @@
 #  include <deal.II/lac/trilinos_index_access.h>
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Teuchos_ParameterList.hpp>
 #  include <Teuchos_RCP.hpp>
 #  include <Epetra_MultiVector.h>
@@ -34,7 +33,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <MueLu.hpp>
 #  include <MueLu_EpetraOperator.hpp>
 #  include <MueLu_MLParameterListInterpreter.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc
index 79c19a658eabe7255dc46c95f1e277cca933e988..0c3b7ae20654eaf5536abc84982a3a78dbab316d 100644 (file)
--- a/source/lac/trilinos_solver.cc
+++ b/source/lac/trilinos_solver.cc
@@ -22,13 +22,11 @@
 #  include <deal.II/lac/trilinos_vector.h>
 #  include <deal.II/lac/trilinos_precondition.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <AztecOO_StatusTest.h>
 #  include <AztecOO_StatusTestMaxIters.h>
 #  include <AztecOO_StatusTestResNorm.h>
 #  include <AztecOO_StatusTestCombo.h>
 #  include <AztecOO_StatusType.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <cmath>
 #  include <limits>

diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc
index 8e502c99668ae117720f71f6cfa26db4cfad74d2..fa7fedc32d72028e4aba1a2092d0a62290b9b9cb 100644 (file)
--- a/source/lac/trilinos_sparse_matrix.cc
+++ b/source/lac/trilinos_sparse_matrix.cc
@@ -28,12 +28,10 @@
 #  include <deal.II/lac/trilinos_index_access.h>
 #  include <deal.II/lac/trilinos_precondition.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
 #  include <ml_epetra_utils.h>
 #  include <ml_struct.h>
 #  include <Teuchos_RCP.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <boost/container/small_vector.hpp>
 

diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc
index 050876e1e78fd1c2dbb3dfc796eda45b93b06595..7e95a9700d9e6738736e23312737983945065e85 100644 (file)
--- a/source/lac/trilinos_sparsity_pattern.cc
+++ b/source/lac/trilinos_sparsity_pattern.cc
@@ -25,9 +25,7 @@
 #  include <deal.II/lac/sparsity_pattern.h>
 #  include <deal.II/lac/trilinos_index_access.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc
index 3de292b2169850b1d162e8a3fbfe52e306ead040..9533693354d21623f528ea5a826389f75df62f82 100644 (file)
--- a/source/lac/trilinos_vector.cc
+++ b/source/lac/trilinos_vector.cc
@@ -22,13 +22,11 @@
 #  include <deal.II/lac/trilinos_parallel_block_vector.h>
 #  include <deal.II/lac/trilinos_index_access.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
 #  include <Epetra_Export.h>
 #  include <Epetra_Vector.h>
 
 #  include <boost/io/ios_state.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <cmath>
 

diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc
index a420d2064c3018894bf959c092d299348e80211d..1a3df42f5c26b5dc245d4c065179756e9f35612d 100644 (file)
--- a/source/opencascade/boundary_lib.cc
+++ b/source/opencascade/boundary_lib.cc
@@ -18,7 +18,6 @@
 
 #ifdef DEAL_II_WITH_OPENCASCADE
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 #include <GCPnts_AbscissaPoint.hxx>
 #include <BRepAdaptor_Curve.hxx>
@@ -37,7 +36,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Handle_Adaptor3d_HCurve.hxx>
 #endif
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc
index 300d2ee6651345a2fcf833416350bd9356f07c03..0f08db57ff3e3d70a53ae98567fdfa48df384458 100644 (file)
--- a/source/opencascade/utilities.cc
+++ b/source/opencascade/utilities.cc
@@ -25,7 +25,6 @@
 #include <iostream>
 #include <set>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 #include <IGESControl_Controller.hxx>
 #include <IGESControl_Reader.hxx>
@@ -78,7 +77,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <GCPnts_AbscissaPoint.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <vector>
 #include <algorithm>