From: Matthias Maier Date: Mon, 6 Dec 2021 20:22:30 +0000 (-0600) Subject: Boost: undo header adjustments X-Git-Tag: v9.3.3~7^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d05794b4579f56291519b140d80bf669807a2305;p=dealii.git Boost: undo header adjustments This little trick does not solve the problem --- diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h index 9fb382ff1e..4aca964eba 100644 --- a/include/deal.II/base/bounding_box_data_out.h +++ b/include/deal.II/base/bounding_box_data_out.h @@ -32,10 +32,10 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # define BOOST_ALLOW_DEPRECATED_HEADERS #endif #include +#include #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # undef BOOST_ALLOW_DEPRECATED_HEADERS #endif -#include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h index 32fbca7621..68fa11e2e3 100644 --- a/include/deal.II/numerics/rtree.h +++ b/include/deal.II/numerics/rtree.h @@ -26,16 +26,11 @@ #include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -#include -/* - * For boost 1.77 compatibility we need to include strategies.hpp before we - * can include rtree.hpp. Otherwise a compilation error within boost - * headers is encountered. - */ #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # define BOOST_ALLOW_DEPRECATED_HEADERS #endif #include +#include #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # undef BOOST_ALLOW_DEPRECATED_HEADERS #endif