From: David Wells Date: Tue, 4 Jan 2022 17:46:30 +0000 (-0500) Subject: Fix compilation with boost 1.78. X-Git-Tag: v9.4.0-rc1~669^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0e76835519d122fd12b5858e16d08641a641c6a;p=dealii.git Fix compilation with boost 1.78. I bisected (fortunately Boost.Geometry a header-only library so adding the include directory sufficed) and https://github.com/boostorg/geometry/commit/6eb9e238bcb37e26dc31d16acf826784a2ba30f4 is where this problem starts for us. See also https://github.com/boostorg/geometry/issues/792 - the easiest fix for all such issues is to just include the project header `boost/geometry/geometry.hpp`. In this particular case, if you look at the commit which causes grid_tools.cc fails to compile, its because we were relying on some implicit includes. In particular, we need the distance header to find the distance between points and boxes, but that was previously included in another file. --- diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h index c4e9d3041f..35448dec4b 100644 --- a/include/deal.II/numerics/rtree.h +++ b/include/deal.II/numerics/rtree.h @@ -26,6 +26,8 @@ #include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#include + #ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS # define BOOST_ALLOW_DEPRECATED_HEADERS #endif diff --git a/tests/boost/rtree_01.cc b/tests/boost/rtree_01.cc index c0a25a50a0..40b2e852b2 100644 --- a/tests/boost/rtree_01.cc +++ b/tests/boost/rtree_01.cc @@ -19,6 +19,7 @@ #include +#include #include #include