From: Matthias Maier <tamiko@43-1.org>
Date: Mon, 6 Dec 2021 20:22:30 +0000 (-0600)
Subject: Boost: undo header adjustments
X-Git-Tag: v9.4.0-rc1~766^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0698c138f8661689f967e481881cf350486462;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 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 <boost/geometry/index/rtree.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
 #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS
 #  undef BOOST_ALLOW_DEPRECATED_HEADERS
 #endif
-#include <boost/geometry/strategies/strategies.hpp>
 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/boost_adaptors/segment.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#include <boost/geometry/strategies/strategies.hpp>
-/*
- * 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 <boost/geometry/index/rtree.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
 #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS
 #  undef BOOST_ALLOW_DEPRECATED_HEADERS
 #endif