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 7469889710a438f34dbeb18144fab40afe8f45ec..6f1245dbeb8bd1d32f082c45723c5a475dfb7d24 100644 (file)
--- 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 8b728b5c005f07434797dc64af7f59c151fdc741..f78bfce16294643a3172813454fd3f4eaa8d017d 100644 (file)
--- 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 1bdc1a74fe9849b39c1a1368b39ed4a9ad646af0..688a44ab9756e9c67fcd946b1a0cc55249349d9f 100644 (file)
--- 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>