From 82860207316f476f884502fa9d3bbc3be75e46c7 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 11 Feb 2018 10:04:40 -0600 Subject: [PATCH] Remove all internal use of DEAL_II_DISABLE_EXTRA_DIAGNOSTICS --- examples/step-33/step-33.cc | 6 ------ examples/step-53/step-53.cc | 6 +----- include/deal.II/base/utilities.h | 2 -- include/deal.II/differentiation/ad/adolc_math.h | 2 -- include/deal.II/differentiation/ad/adolc_number_types.h | 2 -- include/deal.II/differentiation/ad/adolc_product_types.h | 2 -- include/deal.II/differentiation/ad/sacado_number_types.h | 2 -- include/deal.II/differentiation/ad/sacado_product_types.h | 2 -- include/deal.II/grid/grid_tools.h | 2 -- include/deal.II/grid/tria.h | 2 -- include/deal.II/lac/precondition.h | 6 ------ include/deal.II/lac/read_write_vector.h | 2 -- include/deal.II/lac/read_write_vector.templates.h | 2 -- include/deal.II/lac/solver.h | 2 -- include/deal.II/lac/trilinos_epetra_communication_pattern.h | 2 -- include/deal.II/lac/trilinos_epetra_vector.h | 2 -- include/deal.II/lac/trilinos_precondition.h | 2 -- include/deal.II/lac/trilinos_solver.h | 2 -- include/deal.II/lac/trilinos_sparse_matrix.h | 2 -- include/deal.II/lac/trilinos_sparsity_pattern.h | 2 -- include/deal.II/lac/trilinos_vector.h | 2 -- include/deal.II/multigrid/mg_coarse.h | 2 -- include/deal.II/numerics/kdtree.h | 2 -- include/deal.II/opencascade/utilities.h | 2 -- source/base/function_parser.cc | 4 ---- source/base/mpi.cc | 2 -- source/base/parameter_handler.cc | 2 -- source/base/patterns.cc | 2 -- source/base/polynomials_bernstein.cc | 2 -- source/base/symmetric_tensor.cc | 2 -- source/base/utilities.cc | 4 ---- source/dofs/dof_handler_policy.cc | 2 -- source/dofs/dof_renumbering.cc | 2 -- source/grid/grid_in.cc | 2 -- source/lac/sparsity_tools.cc | 4 ---- source/lac/trilinos_epetra_communication_pattern.cc | 2 -- source/lac/trilinos_epetra_vector.cc | 2 -- source/lac/trilinos_precondition.cc | 2 -- source/lac/trilinos_precondition_ml.cc | 2 -- source/lac/trilinos_precondition_muelu.cc | 2 -- source/lac/trilinos_solver.cc | 2 -- source/lac/trilinos_sparse_matrix.cc | 2 -- source/lac/trilinos_sparsity_pattern.cc | 2 -- source/lac/trilinos_vector.cc | 2 -- source/opencascade/boundary_lib.cc | 2 -- source/opencascade/utilities.cc | 2 -- 46 files changed, 1 insertion(+), 109 deletions(-) diff --git a/examples/step-33/step-33.cc b/examples/step-33/step-33.cc index 3629f3cfe6..b98589bdc1 100644 --- 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 #include -// directive into a pair of macros that simply suppress these warnings: -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS // And this again is C++: #include diff --git a/examples/step-53/step-53.cc b/examples/step-53/step-53.cc index 3ffe45c1e9..d0a0b56082 100644 --- 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_DISABLE_EXTRA_DIAGNOSTICS #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h index e49c421b4b..717fd9662f 100644 --- 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 #include #include @@ -48,7 +47,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include #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 82f3cc6f25..c1036075e0 100644 --- 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 #include // Taped double math functions #include // Taped double #include // 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 8dc56effeb..240730c5bf 100644 --- 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 #include // Taped double math functions #include // Taped double #include // Tapeless double -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/differentiation/ad/adolc_product_types.h b/include/deal.II/differentiation/ad/adolc_product_types.h index eb62f82dba..ae608b82fc 100644 --- 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_DISABLE_EXTRA_DIAGNOSTICS #include // Taped double #include // 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 b0cb3ed175..ac93c961bb 100644 --- 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 // 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 // Reverse AD classes (templated) #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/differentiation/ad/sacado_product_types.h b/include/deal.II/differentiation/ad/sacado_product_types.h index 1de5c40488..6295a43f65 100644 --- 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 // 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 // Reverse AD classes (templated) #include -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 af800ccfd0..0cd6071e57 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -31,7 +31,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include @@ -45,7 +44,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 333c97545b..f35a5709b6 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -26,13 +26,11 @@ #include // Ignore deprecation warnings for auto_ptr. -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index f4b167f06e..be3d2e73db 100644 --- 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 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 inline @@ -1980,7 +1977,6 @@ AdditionalData (const unsigned int degree, max_eigenvalue (max_eigenvalue) {} -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS template @@ -1998,7 +1994,6 @@ PreconditionChebyshev::PreconditionChe // avoid warning about deprecated variable AdditionalData::matrix_diagonal_inverse -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS template inline @@ -2035,7 +2030,6 @@ PreconditionChebyshev::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 7b1031b9ff..a57e6c51e6 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -33,9 +33,7 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -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 75cfc9ec55..0f27e74517 100644 --- 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 # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -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 0d82993efa..df590543a0 100644 --- a/include/deal.II/lac/solver.h +++ b/include/deal.II/lac/solver.h @@ -22,9 +22,7 @@ #include // Ignore deprecation warnings for auto_ptr. -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -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 129f123185..64695e3116 100644 --- 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_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index 5aaa4d140e..e0389cea35 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -29,10 +29,8 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include -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 a12605897a..bbe9454b88 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -28,7 +28,6 @@ # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI # include # else @@ -39,7 +38,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -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 38d63ac5de..3701b06aa9 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -28,12 +28,10 @@ # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include -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 0eac855c31..82ca8b2dfa 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -35,7 +35,6 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -48,7 +47,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # else # include # 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 dc73ca78d0..5c7c852584 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -30,7 +30,6 @@ # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # ifdef DEAL_II_WITH_MPI @@ -39,7 +38,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # else # include # 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 bb6066496d..7f7ce9ffee 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -33,7 +33,6 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # ifdef DEAL_II_WITH_MPI // only if MPI is installed # include @@ -44,7 +43,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -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 ee1098b8a8..8ada05f6bc 100644 --- a/include/deal.II/multigrid/mg_coarse.h +++ b/include/deal.II/multigrid/mg_coarse.h @@ -355,7 +355,6 @@ MGCoarseGridApplySmoother::operator() (const unsigned int level, /* ------------------ Functions for MGCoarseGridLACIteration ------------ */ -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS template MGCoarseGridLACIteration @@ -445,7 +444,6 @@ MGCoarseGridLACIteration matrix = linear_operator(LinearOperator(), 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 34cef87d79..3921eddf4d 100644 --- a/include/deal.II/numerics/kdtree.h +++ b/include/deal.II/numerics/kdtree.h @@ -24,9 +24,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -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 bff05c59a2..cffccbe0ce 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -28,7 +28,6 @@ #include // opencascade needs "HAVE_CONFIG_H" to be exported... -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #define HAVE_CONFIG_H #include #include @@ -42,7 +41,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #undef HAVE_CONFIG_H -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS diff --git a/source/base/function_parser.cc b/source/base/function_parser.cc index 09c8449fed..c94aa5e121 100644 --- a/source/base/function_parser.cc +++ b/source/base/function_parser.cc @@ -21,15 +21,11 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #ifdef DEAL_II_WITH_MUPARSER -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #else diff --git a/source/base/mpi.cc b/source/base/mpi.cc index bea0ca2d61..81ceef2393 100644 --- 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 -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 003351a81f..71c42099d2 100644 --- a/source/base/parameter_handler.cc +++ b/source/base/parameter_handler.cc @@ -20,13 +20,11 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/patterns.cc b/source/base/patterns.cc index bb7d3e64d2..5dfe823970 100644 --- a/source/base/patterns.cc +++ b/source/base/patterns.cc @@ -20,13 +20,11 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/polynomials_bernstein.cc b/source/base/polynomials_bernstein.cc index 287adaf7c9..a5a7a288a1 100644 --- a/source/base/polynomials_bernstein.cc +++ b/source/base/polynomials_bernstein.cc @@ -15,9 +15,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc index e1b92b824f..b6c125d0e5 100644 --- 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 -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #endif diff --git a/source/base/utilities.cc b/source/base/utilities.cc index 983e1519a8..6a1f250b8d 100644 --- a/source/base/utilities.cc +++ b/source/base/utilities.cc @@ -27,11 +27,9 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include @@ -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 @@ -66,7 +63,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index a56e9a12b4..35132174b8 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -30,7 +30,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #ifdef DEAL_II_WITH_ZLIB @@ -40,7 +39,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index 2ee6a6f8c8..aba4838358 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -48,10 +48,8 @@ #include #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc index 80b58f2416..eec85a4729 100644 --- 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 // C++ importer interface #include // Output data structure #include // Post processing flags -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc index 312357ff85..e26b02aea4 100644 --- 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 } -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif #ifdef DEAL_II_TRILINOS_WITH_ZOLTAN -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif #include diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc index 93dc7b727a..86c106cb07 100644 --- a/source/lac/trilinos_epetra_communication_pattern.cc +++ b/source/lac/trilinos_epetra_communication_pattern.cc @@ -21,9 +21,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index 40ee86075d..48328fb1a5 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -25,11 +25,9 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index d8cc956f8d..ffca23affc 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -21,13 +21,11 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include # include -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 16fb391023..f65ed6a18c 100644 --- a/source/lac/trilinos_precondition_ml.cc +++ b/source/lac/trilinos_precondition_ml.cc @@ -23,7 +23,6 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -31,7 +30,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -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 b10c04d462..ed5484cb46 100644 --- a/source/lac/trilinos_precondition_muelu.cc +++ b/source/lac/trilinos_precondition_muelu.cc @@ -24,7 +24,6 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -34,7 +33,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index 79c19a658e..0c3b7ae206 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -22,13 +22,11 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 8e502c9966..fa7fedc32d 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -28,12 +28,10 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc index 050876e1e7..7e95a9700d 100644 --- a/source/lac/trilinos_sparsity_pattern.cc +++ b/source/lac/trilinos_sparsity_pattern.cc @@ -25,9 +25,7 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index 3de292b216..9533693354 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -22,13 +22,11 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc index a420d2064c..1a3df42f5c 100644 --- 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 #include @@ -37,7 +36,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc index 300d2ee665..0f08db57ff 100644 --- a/source/opencascade/utilities.cc +++ b/source/opencascade/utilities.cc @@ -25,7 +25,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include @@ -78,7 +77,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include -- 2.39.5