Don't use DEAL_II_DISABLE_EXTRA_DIAGNOSTICS for dependencies

diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h
index b9aa2a443a9eb278fba0bc689023b582aa1aa331..552b16f51ab6859955e7ea430e40b928f04f223b 100644 (file)
--- 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 <deal.II/boost_adaptors/point.h>
 #include <deal.II/boost_adaptors/segment.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-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 b17c18282ce191948743af8cd1e35294ca449d90..efb5a6ca4bffc06a83b798794ef36e5670e238c5 100644 (file)
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -22,9 +22,7 @@
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/mutex.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <vector>

diff --git a/include/deal.II/base/mpi_stub.h b/include/deal.II/base/mpi_stub.h
index bcfe0c0cc731fc4e6c445bb16ffd85e2a8f674ca..82a7041a0c9a4bea8e59ec31fd5317ca3ef39baf 100644 (file)
--- 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 <mpi.h>
-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 29401400762554cd95249c7fdfe896377b19ab30..8225f689f68f8749a4c05f2bcf0f85b2269ca76a 100644 (file)
--- a/include/deal.II/base/parallel.h
+++ b/include/deal.II/base/parallel.h
@@ -30,12 +30,10 @@
 #include <tuple>
 
 #ifdef DEAL_II_WITH_TBB
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <tbb/blocked_range.h>
 #  include <tbb/parallel_for.h>
 #  include <tbb/parallel_reduce.h>
 #  include <tbb/partitioner.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 3d2d74ebd6256b0b49d7d6fd18035a6fc7f7bacf..857c52e6518a273ed3a44571ce02357ffbd373a7 100644 (file)
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -27,13 +27,11 @@
 
 #include <deal.II/fe/component_mask.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/basic_archive.hpp>
 #include <boost/core/demangle.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/property_tree/ptree_serialization.hpp>
 #include <boost/serialization/split_member.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <array>

diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index 858428fce658366f077537b2b8851fedfeb63e09..6269e789a04915c917b5b64cf586b436cf8bff90 100644 (file)
--- a/include/deal.II/base/point.h
+++ b/include/deal.II/base/point.h
@@ -22,10 +22,8 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/tensor.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/geometries/point.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>
 

diff --git a/include/deal.II/base/std_cxx17/variant.h b/include/deal.II/base/std_cxx17/variant.h
index f32ecaa276ddfe050a88781e3a657a5ff320f7c5..25e9ae412d8bf6b00b82c64aba96dfe963010bc6 100644 (file)
--- 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 <variant>
 #else
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/variant.hpp>
-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 15cf1e7f20d2f67fff572b1036bd60572c30f4c3..8fbb9873ee0e9d500826ef166876ac5419a0a881 100644 (file)
--- a/include/deal.II/base/table_handler.h
+++ b/include/deal.II/base/table_handler.h
@@ -22,12 +22,10 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/std_cxx17/variant.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/split_member.hpp>
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <fstream>
 #include <map>

diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h
index 45fe38cb6766f0ecdd2f32e20446f0d8e71375da..50f2d702b82741fc9dbd74afc61c1f192217d532 100644 (file)
--- a/include/deal.II/base/thread_management.h
+++ b/include/deal.II/base/thread_management.h
@@ -35,9 +35,7 @@
 #include <vector>
 
 #ifdef DEAL_II_WITH_TBB
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <tbb/task_group.h>
-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 da7b1571a4a6dcd32468bd16471833a021f628b3..5e7d7e1287076af6429c527a1897dd1062605a55 100644 (file)
--- a/include/deal.II/base/trilinos_utilities.h
+++ b/include/deal.II/base/trilinos_utilities.h
@@ -20,7 +20,6 @@
 
 #include <deal.II/base/exceptions.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #ifdef DEAL_II_WITH_TRILINOS
 #  include <Epetra_Comm.h>
 #  include <Epetra_Map.h>
@@ -32,7 +31,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    include <Epetra_SerialComm.h>
 #  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 87811ad57bdf20e4fa619011a004ddf351e91831..237ed6afcabc8a821d5f4395553b805a46020b71 100644 (file)
--- a/include/deal.II/base/utilities.h
+++ b/include/deal.II/base/utilities.h
@@ -20,17 +20,6 @@
 
 #include <deal.II/base/exceptions.h>
 
-#include <cstddef>
-#include <functional>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <vector>
-
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/core/demangle.hpp>
@@ -41,12 +30,19 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/serialization/complex.hpp>
 #include <boost/serialization/vector.hpp>
 
+#include <cstddef>
+#include <functional>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
+#include <vector>
+
 #ifdef DEAL_II_WITH_ZLIB
 #  include <boost/iostreams/filter/gzip.hpp>
 #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 cff834d899e42577b52e7d327988e8abc1f45abc..63fe6e0a2dc65240d43305ecc89ee4024dbe9c8c 100644 (file)
--- a/include/deal.II/base/work_stream.h
+++ b/include/deal.II/base/work_stream.h
@@ -28,13 +28,11 @@
 #  include <deal.II/base/thread_management.h>
 
 #  ifdef DEAL_II_WITH_TBB
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    ifdef DEAL_II_TBB_WITH_ONEAPI
 #      include <tbb/parallel_pipeline.h>
 #    else
 #      include <tbb/pipeline.h>
 #    endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #  endif
 
 #  include <functional>

diff --git a/include/deal.II/boost_adaptors/bounding_box.h b/include/deal.II/boost_adaptors/bounding_box.h
index cb1803c5b93a44a93f606f93031e32b293d41d89..3f813ec9edac887118dfa8c2fcb420d7eddc81a7 100644 (file)
--- 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/base/bounding_box.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <deal.II/boost_adaptors/point.h>
-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 866ea1447b8ed443b1e5b66de73aaa92bc0289f3..cd76eaf37370736683ff1c1bf8445e090fccb693 100644 (file)
--- a/include/deal.II/boost_adaptors/segment.h
+++ b/include/deal.II/boost_adaptors/segment.h
@@ -22,9 +22,7 @@
 
 #include <deal.II/boost_adaptors/point.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/geometry/geometries/segment.hpp>
-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 bdf48e2402d0fb6d71500bd696c26e0c983d45c4..aa4cec6283d54d7c6fab98a05145e46bdb0085ec 100644 (file)
--- 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 <adolc/internal/usrparms.h>
-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 f55e0de9caf18f23fc5fc998201c3d1493c0eae5..7b4221e26547892b377bee27739970fa02dcafe8 100644 (file)
--- 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 <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.
@@ -75,15 +74,14 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 // Standard forward AD classes (templated)
 #  include <Sacado_Fad_DFad.hpp>
 // Reverse AD classes (templated)
-#  include <Sacado_trad.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
-
 #  include <deal.II/base/exceptions.h>
 #  include <deal.II/base/numbers.h>
 
 #  include <deal.II/differentiation/ad/ad_number_traits.h>
 #  include <deal.II/differentiation/ad/ad_number_types.h>
 
+#  include <Sacado_trad.hpp>
+
 #  include <complex>
 
 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 15b0892980c115225100cd7556a0b3b07073eccf..6c05044f7490368b29e15381f8fde3b990bd37f2 100644 (file)
--- 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 <symengine/basic.h>
-#  include <symengine/dict.h>
-#  include <symengine/symengine_exception.h>
-#  include <symengine/symengine_rcp.h>
-
-// Visitor
-#  include <symengine/visitor.h>
-
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
-
 #  include <deal.II/base/exceptions.h>
 #  include <deal.II/base/numbers.h>
 
@@ -40,6 +29,12 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <boost/serialization/split_member.hpp>
 
+#  include <symengine/basic.h>
+#  include <symengine/dict.h>
+#  include <symengine/symengine_exception.h>
+#  include <symengine/symengine_rcp.h>
+#  include <symengine/visitor.h>
+
 
 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 1373cc027eba8f27b0c28f4c3692b0f5b73fdbf5..78cd812673a0fa6890dfce4f17c563733bb0f50e 100644 (file)
--- 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 <symengine/basic.h>
 #  include <symengine/dict.h>
@@ -33,7 +32,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef HAVE_SYMENGINE_LLVM
 #    include <symengine/llvm_double.h>
 #  endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <deal.II/base/exceptions.h>
 #  include <deal.II/base/logstream.h>

diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h
index 1f68bccfec838e53b793aad66f8b50a69f095f68..68be280fd900623f405fa82ee49fe0fa88b19b68 100644 (file)
--- a/include/deal.II/dofs/dof_accessor.h
+++ b/include/deal.II/dofs/dof_accessor.h
@@ -24,9 +24,7 @@
 
 #include <deal.II/grid/tria_accessor.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <set>
 #include <vector>

diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index e533d16e54bac66e73e0103abba9c30ab0e37353..d756d6e73676ede9ea70061d68edfc0ee7a9996a 100644 (file)
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -46,7 +46,6 @@
 
 #include <deal.II/numerics/rtree.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/random/mersenne_twister.hpp>
@@ -59,7 +58,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/iostreams/filtering_stream.hpp>
 #  include <boost/iostreams/stream.hpp>
 #endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <bitset>
 #include <list>

diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index 05f389e2c31dc38bec0fa9c54bfbaae312332cc1..e9d0cd6cc8186886d873b9aaf4773793e2c1675b 100644 (file)
--- a/include/deal.II/grid/tria_accessor.h
+++ b/include/deal.II/grid/tria_accessor.h
@@ -29,9 +29,7 @@
 #include <deal.II/grid/tria_iterator_base.h>
 #include <deal.II/grid/tria_iterator_selector.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <utility>
 

diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index d3d54f3c12e2e61734f2660499734919a309f9e8..8cdf67858fb68759f84876e5a2fc76d6e8ac6ed6 100644 (file)
--- a/include/deal.II/grid/tria_accessor.templates.h
+++ b/include/deal.II/grid/tria_accessor.templates.h
@@ -29,9 +29,7 @@
 #include <deal.II/grid/tria_iterator.templates.h>
 #include <deal.II/grid/tria_levels.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>
 #include <limits>

diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h
index f2a8ce2f856d36b498b385f707643991abe8ca0f..4e418a9ef10e0618f19c8ef195a10ed4e941a0c4 100644 (file)
--- 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/base/parallel.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <tbb/concurrent_unordered_map.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #include <fstream>

diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
index 3ebade3fde06f07d8aee33dba601f7409de9dbfa..6a561182539131a4e177101d6a2bf0e18a1892bd 100644 (file)
--- a/include/deal.II/numerics/rtree.h
+++ b/include/deal.II/numerics/rtree.h
@@ -25,11 +25,9 @@
 #include <deal.II/boost_adaptors/point.h>
 #include <deal.II/boost_adaptors/segment.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <memory>
 

diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index eacb91a2fa91bd1ef1a0ed6cb8c97c1a992833b9..0b0261c857c501d7218fa184e42d5ada8c9858fc 100644 (file)
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -45,14 +45,12 @@
 #  include <hdf5.h>
 #endif
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/device/back_inserter.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
 #ifdef DEAL_II_WITH_ZLIB
 #  include <boost/iostreams/filter/zlib.hpp>
 #endif
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 

diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index 7655e3cc0a72324704034694a95f80252ea23260..0df0bb07b0f530dc91cf12e304886f9a07f9b8eb 100644 (file)
--- 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 <taskflow/taskflow.hpp>
-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 7da508bf4987d407a12fe20f094f75936e417a9d..15104695ba1c4195fb9211d91b6280698ae9eefa 100644 (file)
--- a/source/base/parameter_handler.cc
+++ b/source/base/parameter_handler.cc
@@ -20,7 +20,6 @@
 #include <deal.II/base/path_search.h>
 #include <deal.II/base/utilities.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/algorithm/string.hpp>
 #include <boost/io/ios_state.hpp>
@@ -28,7 +27,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #undef BOOST_BIND_GLOBAL_PLACEHOLDERS
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <cctype>

diff --git a/source/base/patterns.cc b/source/base/patterns.cc
index 7b7851d20de1764b7703235701f33fde139bf8bc..69322932e4c232d20c07fef0f60b758dc3fc1433 100644 (file)
--- a/source/base/patterns.cc
+++ b/source/base/patterns.cc
@@ -20,14 +20,12 @@
 #include <deal.II/base/patterns.h>
 #include <deal.II/base/utilities.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/io/ios_state.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #undef BOOST_BIND_GLOBAL_PLACEHOLDERS
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <cctype>

diff --git a/source/base/tensor_product_polynomials.cc b/source/base/tensor_product_polynomials.cc
index f908a36d6fe6844ac61a8243f0a5b5df21efbdcd..df8e41e669c7ff59b7b80c058e54ffc1a0690aec 100644 (file)
--- a/source/base/tensor_product_polynomials.cc
+++ b/source/base/tensor_product_polynomials.cc
@@ -19,9 +19,7 @@
 #include <deal.II/base/table.h>
 #include <deal.II/base/tensor_product_polynomials.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <array>
 #include <memory>

diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index 2894b79ecd33dc49a6d5897523c569a29acde82e..30bbec4047724047f23912ac1bb5e4affc477dee 100644 (file)
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -28,7 +28,6 @@
 #include <deal.II/base/thread_local_storage.h>
 #include <deal.II/base/utilities.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/archive/iterators/base64_from_binary.hpp>
 #include <boost/archive/iterators/binary_from_base64.hpp>
@@ -37,7 +36,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/lexical_cast.hpp>
 #include <boost/random.hpp>
 #undef BOOST_BIND_GLOBAL_PLACEHOLDERS
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <bitset>

diff --git a/source/cgal/intersections.cc b/source/cgal/intersections.cc
index ae393e730d3b640a3e05872604aeeff41481f28b..a1634706f303e2de69ceed51e40c0f98242a02ad 100644 (file)
--- a/source/cgal/intersections.cc
+++ b/source/cgal/intersections.cc
@@ -30,7 +30,6 @@
 
 #  include <deal.II/grid/tria.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <CGAL/Boolean_set_operations_2.h>
 #  include <CGAL/Cartesian.h>
 #  include <CGAL/Circular_kernel_intersections.h>
@@ -54,7 +53,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <CGAL/Triangulation_3.h>
 #  include <CGAL/Triangulation_face_base_with_id_2.h>
 #  include <CGAL/Triangulation_face_base_with_info_2.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #  include <deal.II/cgal/utilities.h>
 
 #  include <fstream>

diff --git a/source/differentiation/ad/ad_drivers.cc b/source/differentiation/ad/ad_drivers.cc
index 7222824802d287484be12dfc0d79eee1a2252d86..0f90e31bb9420e5e1c33d4e2756ed1ca2272314c 100644 (file)
--- a/source/differentiation/ad/ad_drivers.cc
+++ b/source/differentiation/ad/ad_drivers.cc
@@ -31,13 +31,9 @@
 #  include <deal.II/lac/vector.h>
 
 #  ifdef DEAL_II_WITH_ADOLC
-
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    include <adolc/adolc_fatalerror.h>
 #    include <adolc/drivers/drivers.h>
 #    include <adolc/taping.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
-
 #  endif // DEAL_II_WITH_ADOLC
 
 #  include <vector>

diff --git a/source/differentiation/sd/symengine_math.cc b/source/differentiation/sd/symengine_math.cc
index 0ea483a405132b56bf7681624d99fa67e981d2cd..78b69e473f7a58bb4ddc66baea820dfede4803fc 100644 (file)
--- 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 <deal.II/differentiation/sd/symengine_math.h>
+
 #  include <symengine/add.h>
 #  include <symengine/functions.h>
 #  include <symengine/mul.h>
 #  include <symengine/pow.h>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
-
-#  include <deal.II/differentiation/sd/symengine_math.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc
index e3c34847557e037b4b6f86c1b345d1b3fd8c1a59..4a772b49f6c33d912805ac1e45c86f2c8ef10a23 100644 (file)
--- a/source/dofs/dof_renumbering.cc
+++ b/source/dofs/dof_renumbering.cc
@@ -45,7 +45,6 @@
 #include <deal.II/multigrid/mg_constrained_dofs.h>
 #include <deal.II/multigrid/mg_tools.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
@@ -58,7 +57,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/random/uniform_int_distribution.hpp>
 
 #undef BOOST_BIND_GLOBAL_PLACEHOLDERS
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <cmath>

diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc
index cff0ae89ef7115d0f892fe761188d27ab0d026af..87ca593b73c74074f20e3390f725108546efebed 100644 (file)
--- a/source/fe/fe_values.cc
+++ b/source/fe/fe_values.cc
@@ -45,9 +45,7 @@
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/vector_element_access.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <iomanip>
 #include <memory>

diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
index dc87105a038de6367cef56fbdbd7923a68cf0d72..7e069448d3bf2bbdb526795e79394a67b7f60725 100644 (file)
--- a/source/fe/mapping.cc
+++ b/source/fe/mapping.cc
@@ -20,7 +20,6 @@
 
 #include <deal.II/grid/tria.h>
 
-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 <limits>
 

diff --git a/source/fe/mapping_fe.cc b/source/fe/mapping_fe.cc
index b5ff1b602cb600df482b4b521250c41298bac392..09be71b98e046b7d8a9eb58acbb32a39e9903c8a 100644 (file)
--- a/source/fe/mapping_fe.cc
+++ b/source/fe/mapping_fe.cc
@@ -33,9 +33,7 @@
 
 #include <deal.II/lac/full_matrix.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <array>

diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
index 8b3db4ca05652c2d320529a01cd1b974af6e297c..c32a86edb12864adb8f41555407874498c112b0f 100644 (file)
--- a/source/fe/mapping_q.cc
+++ b/source/fe/mapping_q.cc
@@ -34,9 +34,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_iterator.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <array>

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
index 8dd189f274b5e344a49f471091f7e3305ad29908..079d416ea677339c26086eeaed819201cc005582 100644 (file)
--- 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 2e0ac11b1946eec5b94872f8fa62e62cd15c7ae2..ba05ef92f119e9f26b27b4f16c2d10965f0926a7 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -59,11 +59,8 @@
 
 #include <deal.II/physics/transformations.h>
 
-
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <array>
 #include <cmath>

diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc
index a4b08a1ca0a89177fbe953e7d40abda50d50a0e9..d45189b83230c7214cff384dfbe1f2d8a41f581d 100644 (file)
--- a/source/grid/manifold.cc
+++ b/source/grid/manifold.cc
@@ -24,9 +24,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>
 #include <limits>

diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc
index 9f4c859e733f7cd45f2b610ce0f319f18fc087f0..fe9a6c6e884b019a9bdb189ebc65edbbf187f29c 100644 (file)
--- a/source/grid/manifold_lib.cc
+++ b/source/grid/manifold_lib.cc
@@ -28,9 +28,7 @@
 
 #include <deal.II/physics/vector_relations.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>
 #include <limits>

diff --git a/source/lac/sparsity_pattern_base.cc b/source/lac/sparsity_pattern_base.cc
index 78d46aa538f9dc19abca59d108206491f015043a..fa6567a999724adf12c803dfcff5ae1ae55b2ec7 100644 (file)
--- a/source/lac/sparsity_pattern_base.cc
+++ b/source/lac/sparsity_pattern_base.cc
@@ -15,9 +15,7 @@
 
 #include <deal.II/lac/sparsity_pattern_base.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <algorithm>
 #include <utility>

diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc
index 5d0ce1392f64babd28c7df884fbe84dc3b40f295..d0d3c26374e05b25e41898ad9383e249836febe7 100644 (file)
--- a/source/lac/trilinos_sparse_matrix.cc
+++ b/source/lac/trilinos_sparse_matrix.cc
@@ -28,9 +28,7 @@
 #  include <deal.II/lac/trilinos_precondition.h>
 #  include <deal.II/lac/trilinos_sparsity_pattern.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <boost/container/small_vector.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  ifdef DEAL_II_TRILINOS_WITH_EPETRAEXT
 #    include <EpetraExt_MatrixMatrix.h>

diff --git a/tests/quick_tests/taskflow.cc b/tests/quick_tests/taskflow.cc
index f5eacbf656b38de0c67036c2a5acb06bd937cdc1..8d43d8dcb403fd5272d49483e5dc30e2a6ef4517 100644 (file)
--- a/tests/quick_tests/taskflow.cc
+++ b/tests/quick_tests/taskflow.cc
@@ -17,9 +17,7 @@
 
 #include <deal.II/base/thread_management.h>
 
-DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <taskflow/taskflow.hpp>
-DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <iostream>