From 8671fa72725da50d49bc717fc4f5b0e548b8d37d Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sun, 14 Jul 2024 14:35:47 +0200 Subject: [PATCH] Use std::ranges::subrange instead of boost::iterator_range --- include/partitioner/partition_graph.hpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/include/partitioner/partition_graph.hpp b/include/partitioner/partition_graph.hpp index 86b3a546d..bbabd1b96 100644 --- a/include/partitioner/partition_graph.hpp +++ b/include/partitioner/partition_graph.hpp @@ -8,8 +8,7 @@ #include #include "util/typedefs.hpp" -#include - +#include namespace osrm::partitioner { @@ -84,26 +83,26 @@ template class RemappableGraph auto Edges(const NodeID nid) { - return boost::make_iterator_range(edges.begin() + nodes[nid].edges_begin, - edges.begin() + nodes[nid].edges_end); + return std::ranges::subrange(edges.begin() + nodes[nid].edges_begin, + edges.begin() + nodes[nid].edges_end); } auto Edges(const NodeID nid) const { - return boost::make_iterator_range(edges.begin() + nodes[nid].edges_begin, - edges.begin() + nodes[nid].edges_end); + return std::ranges::subrange(edges.begin() + nodes[nid].edges_begin, + edges.begin() + nodes[nid].edges_end); } auto Edges(const NodeT &node) { - return boost::make_iterator_range(edges.begin() + node.edges_begin, - edges.begin() + node.edges_end); + return std::ranges::subrange(edges.begin() + node.edges_begin, + edges.begin() + node.edges_end); } auto Edges(const NodeT &node) const { - return boost::make_iterator_range(edges.begin() + node.edges_begin, - edges.begin() + node.edges_end); + return std::ranges::subrange(edges.begin() + node.edges_begin, + edges.begin() + node.edges_end); } auto BeginEdges(const NodeID nid) const { return edges.begin() + nodes[nid].edges_begin; } @@ -118,8 +117,8 @@ template class RemappableGraph EdgeID EndEdgeID(const NodeID nid) const { return nodes[nid].edges_end; } // iterate over all nodes - auto Nodes() { return boost::make_iterator_range(nodes.begin(), nodes.end()); } - auto Nodes() const { return boost::make_iterator_range(nodes.begin(), nodes.end()); } + auto Nodes() { return std::ranges::subrange(nodes.begin(), nodes.end()); } + auto Nodes() const { return std::ranges::subrange(nodes.begin(), nodes.end()); } NodeID GetID(const NodeT &node) const {