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 9fb382ff1ea48f009bcd1eddd6f29d8c046fcaec..4aca964eba014424c1f6cf623943b379f2d9b65e 100644 (file)
--- 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 32fbca762102cdf7bd85a991e502edc3debda7b0..68fa11e2e365291c339a06f19cf94f9afa15fb5d 100644 (file)
--- 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