From 4e0698c138f8661689f967e481881cf350486462 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 6 Dec 2021 14:22:30 -0600 Subject: [PATCH] Boost: undo header adjustments This little trick does not solve the problem --- include/deal.II/base/bounding_box_data_out.h | 2 +- include/deal.II/numerics/rtree.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h index 6f1245dbeb..7fc0c29262 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 688a44ab97..c4e9d3041f 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 -- 2.39.5