Skip to content

Modify library/LibUtilities/BasicUtils/Interpolator.h header file

Jacques Xing requested to merge feature/boost-fix into master

Issue/feature addressed

Compilation error with boost 1.77

Proposed solution

For boost 1.77 compatibility, strategies.hpp has to be included before rtree.hpp. Also, strategies.hpp is required for boost 1.77 only.

Implementation

  • For boost 1.77 compatibility, the following include
#include <boost/geometry/index/rtree.hpp>
#include <boost/geometry/strategies/strategies.hpp>

should be changed to

#if BOOST_VERSION == 107700
#include <boost/geometry/strategies/strategies.hpp>
#endif
#include <boost/geometry/index/rtree.hpp>

Tests

N/A

Notes

Checklist

  • Functions and classes, or changes to them, are documented.
  • User guide/documentation is updated.
  • Changelog is updated.
  • Suitable tests added for new functionality.
  • Contributed code is correctly formatted. (See the contributing guidelines).
  • License added to any new files.
  • No extraneous files have been added (e.g. compiler output or test data files).

Warning

On the 19.07 the code formatting (code style) was standardised using clang-format, over the whole Nektar++ code. This means changes in your branch will conflict with formatting changes on the master branch. To resolve these conflicts , see #295 (closed)

Edited by Jacques Xing

Merge request reports