From 92e56bfa086c8a0003df53a4888a835be855aad0 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 15 Feb 2023 10:50:25 -0500 Subject: [PATCH] Don't use DEAL_II_DISABLE_EXTRA_DIAGNOSTICS for dependencies --- include/deal.II/base/bounding_box_data_out.h | 2 -- include/deal.II/base/index_set.h | 2 -- include/deal.II/base/mpi_stub.h | 2 -- include/deal.II/base/parallel.h | 2 -- include/deal.II/base/patterns.h | 2 -- include/deal.II/base/point.h | 2 -- include/deal.II/base/std_cxx17/variant.h | 2 -- include/deal.II/base/table_handler.h | 2 -- include/deal.II/base/thread_management.h | 2 -- include/deal.II/base/trilinos_utilities.h | 2 -- include/deal.II/base/utilities.h | 22 ++++++++----------- include/deal.II/base/work_stream.h | 2 -- include/deal.II/boost_adaptors/bounding_box.h | 2 -- include/deal.II/boost_adaptors/segment.h | 2 -- .../deal.II/differentiation/ad/ad_drivers.h | 2 -- .../differentiation/ad/sacado_number_types.h | 6 ++--- .../sd/symengine_number_visitor_internal.h | 17 +++++--------- .../differentiation/sd/symengine_optimizer.h | 2 -- include/deal.II/dofs/dof_accessor.h | 2 -- include/deal.II/grid/grid_tools.h | 2 -- include/deal.II/grid/tria_accessor.h | 2 -- .../deal.II/grid/tria_accessor.templates.h | 2 -- .../matrix_free/matrix_free.templates.h | 2 -- include/deal.II/numerics/rtree.h | 2 -- source/base/data_out_base.cc | 2 -- source/base/multithread_info.cc | 2 -- source/base/parameter_handler.cc | 2 -- source/base/patterns.cc | 2 -- source/base/tensor_product_polynomials.cc | 2 -- source/base/utilities.cc | 2 -- source/cgal/intersections.cc | 2 -- source/differentiation/ad/ad_drivers.cc | 4 ---- source/differentiation/sd/symengine_math.cc | 7 ++---- source/dofs/dof_renumbering.cc | 2 -- source/fe/fe_values.cc | 2 -- source/fe/mapping.cc | 2 -- source/fe/mapping_fe.cc | 2 -- source/fe/mapping_q.cc | 2 -- source/grid/CMakeLists.txt | 2 +- source/grid/grid_tools.cc | 3 --- source/grid/manifold.cc | 2 -- source/grid/manifold_lib.cc | 2 -- source/lac/sparsity_pattern_base.cc | 2 -- source/lac/trilinos_sparse_matrix.cc | 2 -- tests/quick_tests/taskflow.cc | 2 -- 45 files changed, 20 insertions(+), 117 deletions(-) diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h index b9aa2a443a..552b16f51a 100644 --- a/include/deal.II/base/bounding_box_data_out.h +++ b/include/deal.II/base/bounding_box_data_out.h @@ -27,10 +27,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/base/index_set.h b/include/deal.II/base/index_set.h index b17c18282c..efb5a6ca4b 100644 --- a/include/deal.II/base/index_set.h +++ b/include/deal.II/base/index_set.h @@ -22,9 +22,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/base/mpi_stub.h b/include/deal.II/base/mpi_stub.h index bcfe0c0cc7..82a7041a0c 100644 --- a/include/deal.II/base/mpi_stub.h +++ b/include/deal.II/base/mpi_stub.h @@ -23,9 +23,7 @@ // e.g., MPI_Comm in the API. #if defined(DEAL_II_WITH_MPI) || defined(DEAL_II_WITH_PETSC) -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #else // without MPI, we would still like to use // some constructs with MPI data diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h index 2940140076..8225f689f6 100644 --- a/include/deal.II/base/parallel.h +++ b/include/deal.II/base/parallel.h @@ -30,12 +30,10 @@ #include #ifdef DEAL_II_WITH_TBB -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h index 3d2d74ebd6..857c52e651 100644 --- a/include/deal.II/base/patterns.h +++ b/include/deal.II/base/patterns.h @@ -27,13 +27,11 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h index 858428fce6..6269e789a0 100644 --- a/include/deal.II/base/point.h +++ b/include/deal.II/base/point.h @@ -22,10 +22,8 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/include/deal.II/base/std_cxx17/variant.h b/include/deal.II/base/std_cxx17/variant.h index f32ecaa276..25e9ae412d 100644 --- a/include/deal.II/base/std_cxx17/variant.h +++ b/include/deal.II/base/std_cxx17/variant.h @@ -20,9 +20,7 @@ #ifdef DEAL_II_HAVE_CXX17 # include #else -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/table_handler.h b/include/deal.II/base/table_handler.h index 15cf1e7f20..8fbb9873ee 100644 --- a/include/deal.II/base/table_handler.h +++ b/include/deal.II/base/table_handler.h @@ -22,12 +22,10 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index 45fe38cb67..50f2d702b8 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -35,9 +35,7 @@ #include #ifdef DEAL_II_WITH_TBB -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/trilinos_utilities.h b/include/deal.II/base/trilinos_utilities.h index da7b1571a4..5e7d7e1287 100644 --- a/include/deal.II/base/trilinos_utilities.h +++ b/include/deal.II/base/trilinos_utilities.h @@ -20,7 +20,6 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #ifdef DEAL_II_WITH_TRILINOS # include # include @@ -32,7 +31,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # endif #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h index 87811ad57b..237ed6afca 100644 --- a/include/deal.II/base/utilities.h +++ b/include/deal.II/base/utilities.h @@ -20,17 +20,6 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include - -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS - #include #include #include @@ -41,12 +30,19 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #ifdef DEAL_II_WITH_ZLIB # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - DEAL_II_NAMESPACE_OPEN // forward declare Point diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h index cff834d899..63fe6e0a2d 100644 --- a/include/deal.II/base/work_stream.h +++ b/include/deal.II/base/work_stream.h @@ -28,13 +28,11 @@ # include # ifdef DEAL_II_WITH_TBB -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_TBB_WITH_ONEAPI # include # else # include # endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # endif # include diff --git a/include/deal.II/boost_adaptors/bounding_box.h b/include/deal.II/boost_adaptors/bounding_box.h index cb1803c5b9..3f813ec9ed 100644 --- a/include/deal.II/boost_adaptors/bounding_box.h +++ b/include/deal.II/boost_adaptors/bounding_box.h @@ -20,9 +20,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS namespace boost diff --git a/include/deal.II/boost_adaptors/segment.h b/include/deal.II/boost_adaptors/segment.h index 866ea1447b..cd76eaf373 100644 --- a/include/deal.II/boost_adaptors/segment.h +++ b/include/deal.II/boost_adaptors/segment.h @@ -22,9 +22,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/differentiation/ad/ad_drivers.h b/include/deal.II/differentiation/ad/ad_drivers.h index bdf48e2402..aa4cec6283 100644 --- a/include/deal.II/differentiation/ad/ad_drivers.h +++ b/include/deal.II/differentiation/ad/ad_drivers.h @@ -29,9 +29,7 @@ #ifdef DEAL_II_WITH_ADOLC -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif // DEAL_II_WITH_ADOLC diff --git a/include/deal.II/differentiation/ad/sacado_number_types.h b/include/deal.II/differentiation/ad/sacado_number_types.h index f55e0de9ca..7b4221e265 100644 --- a/include/deal.II/differentiation/ad/sacado_number_types.h +++ b/include/deal.II/differentiation/ad/sacado_number_types.h @@ -67,7 +67,6 @@ DEAL_II_NAMESPACE_CLOSE #ifdef DEAL_II_TRILINOS_WITH_SACADO -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. @@ -75,15 +74,14 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS // Standard forward AD classes (templated) # include // Reverse AD classes (templated) -# include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - # include # include # include # include +# include + # include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/differentiation/sd/symengine_number_visitor_internal.h b/include/deal.II/differentiation/sd/symengine_number_visitor_internal.h index 15b0892980..6c05044f74 100644 --- a/include/deal.II/differentiation/sd/symengine_number_visitor_internal.h +++ b/include/deal.II/differentiation/sd/symengine_number_visitor_internal.h @@ -20,18 +20,7 @@ #ifdef DEAL_II_WITH_SYMENGINE -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS // Low level -# include -# include -# include -# include - -// Visitor -# include - -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - # include # include @@ -40,6 +29,12 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include +# include +# include +# include +# include +# include + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/differentiation/sd/symengine_optimizer.h b/include/deal.II/differentiation/sd/symengine_optimizer.h index 1373cc027e..78cd812673 100644 --- a/include/deal.II/differentiation/sd/symengine_optimizer.h +++ b/include/deal.II/differentiation/sd/symengine_optimizer.h @@ -20,7 +20,6 @@ #ifdef DEAL_II_WITH_SYMENGINE -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS // Low level # include # include @@ -33,7 +32,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef HAVE_SYMENGINE_LLVM # include # endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h index 1f68bccfec..68be280fd9 100644 --- a/include/deal.II/dofs/dof_accessor.h +++ b/include/deal.II/dofs/dof_accessor.h @@ -24,9 +24,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index e533d16e54..d756d6e736 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -46,7 +46,6 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include @@ -59,7 +58,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h index 05f389e2c3..e9d0cd6cc8 100644 --- a/include/deal.II/grid/tria_accessor.h +++ b/include/deal.II/grid/tria_accessor.h @@ -29,9 +29,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h index d3d54f3c12..8cdf67858f 100644 --- a/include/deal.II/grid/tria_accessor.templates.h +++ b/include/deal.II/grid/tria_accessor.templates.h @@ -29,9 +29,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index f2a8ce2f85..4e418a9ef1 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -49,9 +49,7 @@ #ifdef DEAL_II_WITH_TBB # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif #include diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h index 3ebade3fde..6a56118253 100644 --- a/include/deal.II/numerics/rtree.h +++ b/include/deal.II/numerics/rtree.h @@ -25,11 +25,9 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index eacb91a2fa..0b0261c857 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -45,14 +45,12 @@ # include #endif -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include #ifdef DEAL_II_WITH_ZLIB # include #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc index 7655e3cc0a..0df0bb07b0 100644 --- a/source/base/multithread_info.cc +++ b/source/base/multithread_info.cc @@ -31,9 +31,7 @@ #ifdef DEAL_II_WITH_TASKFLOW -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 7da508bf49..15104695ba 100644 --- a/source/base/parameter_handler.cc +++ b/source/base/parameter_handler.cc @@ -20,7 +20,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include @@ -28,7 +27,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #undef BOOST_BIND_GLOBAL_PLACEHOLDERS -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/patterns.cc b/source/base/patterns.cc index 7b7851d20d..69322932e4 100644 --- a/source/base/patterns.cc +++ b/source/base/patterns.cc @@ -20,14 +20,12 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include #include #undef BOOST_BIND_GLOBAL_PLACEHOLDERS -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/tensor_product_polynomials.cc b/source/base/tensor_product_polynomials.cc index f908a36d6f..df8e41e669 100644 --- a/source/base/tensor_product_polynomials.cc +++ b/source/base/tensor_product_polynomials.cc @@ -19,9 +19,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/utilities.cc b/source/base/utilities.cc index 2894b79ecd..30bbec4047 100644 --- a/source/base/utilities.cc +++ b/source/base/utilities.cc @@ -28,7 +28,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include @@ -37,7 +36,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #undef BOOST_BIND_GLOBAL_PLACEHOLDERS -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/cgal/intersections.cc b/source/cgal/intersections.cc index ae393e730d..a1634706f3 100644 --- a/source/cgal/intersections.cc +++ b/source/cgal/intersections.cc @@ -30,7 +30,6 @@ # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -54,7 +53,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/source/differentiation/ad/ad_drivers.cc b/source/differentiation/ad/ad_drivers.cc index 7222824802..0f90e31bb9 100644 --- a/source/differentiation/ad/ad_drivers.cc +++ b/source/differentiation/ad/ad_drivers.cc @@ -31,13 +31,9 @@ # include # ifdef DEAL_II_WITH_ADOLC - -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - # endif // DEAL_II_WITH_ADOLC # include diff --git a/source/differentiation/sd/symengine_math.cc b/source/differentiation/sd/symengine_math.cc index 0ea483a405..78b69e473f 100644 --- a/source/differentiation/sd/symengine_math.cc +++ b/source/differentiation/sd/symengine_math.cc @@ -18,15 +18,12 @@ #ifdef DEAL_II_WITH_SYMENGINE -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -// Number operations +# include + # include # include # include # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS - -# include DEAL_II_NAMESPACE_OPEN diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index e3c3484755..4a772b49f6 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -45,7 +45,6 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include @@ -58,7 +57,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #undef BOOST_BIND_GLOBAL_PLACEHOLDERS -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index cff0ae89ef..87ca593b73 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -45,9 +45,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc index dc87105a03..7e069448d3 100644 --- a/source/fe/mapping.cc +++ b/source/fe/mapping.cc @@ -20,7 +20,6 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # define BOOST_ALLOW_DEPRECATED_HEADERS #endif @@ -28,7 +27,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # undef BOOST_ALLOW_DEPRECATED_HEADERS #endif -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/fe/mapping_fe.cc b/source/fe/mapping_fe.cc index b5ff1b602c..09be71b98e 100644 --- a/source/fe/mapping_fe.cc +++ b/source/fe/mapping_fe.cc @@ -33,9 +33,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 8b3db4ca05..c32a86edb1 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -34,9 +34,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt index 8dd189f274..079d416ea6 100644 --- a/source/grid/CMakeLists.txt +++ b/source/grid/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # -Wmisleading-indentation will be disabled due to a humongous line of over # 100k characters produced by one of the CGAL headers. Unfortunately, # guarding the include by DEAL_II_DISABLE_EXTRA_DIAGNOSTICS is not enough -# due to a longstanding bug in gcc. Thus, simply wet +# due to a longstanding bug in gcc. Thus, simply set # -Wno-misleading-indentation on the command line for the # grid_generator_cgal.cc compilation unit. # diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 2e0ac11b19..ba05ef92f1 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -59,11 +59,8 @@ #include - -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc index a4b08a1ca0..d45189b832 100644 --- a/source/grid/manifold.cc +++ b/source/grid/manifold.cc @@ -24,9 +24,7 @@ #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index 9f4c859e73..fe9a6c6e88 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -28,9 +28,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/lac/sparsity_pattern_base.cc b/source/lac/sparsity_pattern_base.cc index 78d46aa538..fa6567a999 100644 --- a/source/lac/sparsity_pattern_base.cc +++ b/source/lac/sparsity_pattern_base.cc @@ -15,9 +15,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #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 5d0ce1392f..d0d3c26374 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -28,9 +28,7 @@ # include # include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_TRILINOS_WITH_EPETRAEXT # include diff --git a/tests/quick_tests/taskflow.cc b/tests/quick_tests/taskflow.cc index f5eacbf656..8d43d8dcb4 100644 --- a/tests/quick_tests/taskflow.cc +++ b/tests/quick_tests/taskflow.cc @@ -17,9 +17,7 @@ #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include -DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include -- 2.39.5