Merge branch 'master' into sf-ankerl

This commit is contained in:
Siarhei Fedartsou
2024-06-25 17:53:09 +02:00
89 changed files with 1569 additions and 1017 deletions
+2 -1
View File
@@ -3,9 +3,10 @@
#include "../common/range_tools.hpp"
#include "../common/temporary_file.hpp"
#include <boost/filesystem.hpp>
#include <boost/test/unit_test.hpp>
#include <filesystem>
BOOST_AUTO_TEST_SUITE(serialization)
using namespace osrm;
+1 -1
View File
@@ -227,7 +227,7 @@ void sampling_verify_rtree(RTreeT &rtree,
}
template <typename RTreeT, typename FixtureT>
auto make_rtree(const boost::filesystem::path &path, FixtureT &fixture)
auto make_rtree(const std::filesystem::path &path, FixtureT &fixture)
{
return RTreeT(fixture.edges, fixture.coords, path);
}