[9.3] Boost 1.78 #13180
Merged
[9.3] Boost 1.78 #13180
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Otherwise, including both header files in reverse order leads to a
compilation failure:
```
In file included from /usr/include/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp:25,
from /usr/include/boost/geometry/index/detail/rtree/rstar/rstar.hpp:15,
from /usr/include/boost/geometry/index/rtree.hpp:80,
from ../include/deal.II/numerics/rtree.h:29,
from ../include/deal.II/grid/grid_tools.h:49,
from ../include/deal.II/numerics/vector_tools_point_gradient.templates.h:22,
from ../source/numerics/vector_tools_point_gradient.cc:17:
/usr/include/boost/geometry/index/detail/algorithms/intersection_content.hpp: In function ‘bool boost::geometry::index::detail::disjoint_box_box(const Box&, const Box&, const boost::geometry::default_strategy&)’:
/usr/include/boost/geometry/index/detail/algorithms/intersection_content.hpp:35:32: error: ‘boost::geometry::strategy::disjoint’ has not been declared
35 | typedef typename strategy::disjoint::services::default_strategy<Box, Box>::type strategy_type;
| ^~~~~~~~
/usr/include/boost/geometry/index/detail/algorithms/intersection_content.hpp:35:68: error: expected unqualified-id before ‘<’ token
35 | typedef typename strategy::disjoint::services::default_strategy<Box, Box>::type strategy_type;
| ^
/usr/include/boost/geometry/index/detail/algorithms/intersection_content.hpp:36:83: error: class template argument deduction failed:
36 | return geometry::detail::disjoint::disjoint_box_box(box1, box2, strategy_type());
```
This little trick does not solve the problem
I bisected (fortunately Boost.Geometry a header-only library so adding the include directory sufficed) and boostorg/geometry@6eb9e23 is where this problem starts for us. See also boostorg/geometry#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.
tamiko
approved these changes
Jan 6, 2022
|
/rebuild |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Port of #13165 and other relevant patches to the 9.3 branch.
At least Arch Linux has moved to oneAPI and boost > 1.76 - I will either need to package patches myself or we can do the release. I think the later is the better choice.