From: Matthias Maier <tamiko@43-1.org>
Date: Wed, 1 Dec 2021 03:25:36 +0000 (-0600)
Subject: Boost includes: use BOOST_ALLOW_DEPRECATED_HEADERS to suppress warnings
X-Git-Tag: v9.4.0-rc1~778^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13021%2Fhead;p=dealii.git

Boost includes: use BOOST_ALLOW_DEPRECATED_HEADERS to suppress warnings
---

diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h
index 7469889710..6f1245dbeb 100644
--- a/include/deal.II/base/bounding_box_data_out.h
+++ b/include/deal.II/base/bounding_box_data_out.h
@@ -28,7 +28,13 @@
 #include <deal.II/boost_adaptors/segment.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS
+#  define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
 #include <boost/geometry/index/rtree.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/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index 8b728b5c00..f78bfce162 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -52,7 +52,6 @@
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
-#include <boost/geometry/index/rtree.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/vector.hpp>
diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
index 1bdc1a74fe..688a44ab97 100644
--- a/include/deal.II/numerics/rtree.h
+++ b/include/deal.II/numerics/rtree.h
@@ -32,7 +32,13 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
  * 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>
+#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS
+#  undef BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <memory>