Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use std::ranges::subrange instead of boost::iterator_range

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-07-14 14:35:47 +02:00
parent fd174a433a
commit 8671fa7272
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/partitioner/partition_graph.hpp
View File

@ -8,8 +8,7 @@
#include <vector> #include <vector>
#include "util/typedefs.hpp" #include "util/typedefs.hpp"
#include <boost/range/iterator_range.hpp> #include <ranges>
namespace osrm::partitioner namespace osrm::partitioner
{ {
@ -84,25 +83,25 @@ template <typename NodeEntryT, typename EdgeEntryT> class RemappableGraph
auto Edges(const NodeID nid) auto Edges(const NodeID nid)
{ {
return boost::make_iterator_range(edges.begin() + nodes[nid].edges_begin, return std::ranges::subrange(edges.begin() + nodes[nid].edges_begin,
edges.begin() + nodes[nid].edges_end); edges.begin() + nodes[nid].edges_end);
} }
auto Edges(const NodeID nid) const auto Edges(const NodeID nid) const
{ {
return boost::make_iterator_range(edges.begin() + nodes[nid].edges_begin, return std::ranges::subrange(edges.begin() + nodes[nid].edges_begin,
edges.begin() + nodes[nid].edges_end); edges.begin() + nodes[nid].edges_end);
} }
auto Edges(const NodeT &node) auto Edges(const NodeT &node)
{ {
return boost::make_iterator_range(edges.begin() + node.edges_begin, return std::ranges::subrange(edges.begin() + node.edges_begin,
edges.begin() + node.edges_end); edges.begin() + node.edges_end);
} }
auto Edges(const NodeT &node) const auto Edges(const NodeT &node) const
{ {
return boost::make_iterator_range(edges.begin() + node.edges_begin, return std::ranges::subrange(edges.begin() + node.edges_begin,
edges.begin() + node.edges_end); edges.begin() + node.edges_end);
} }
@ -118,8 +117,8 @@ template <typename NodeEntryT, typename EdgeEntryT> class RemappableGraph
EdgeID EndEdgeID(const NodeID nid) const { return nodes[nid].edges_end; } EdgeID EndEdgeID(const NodeID nid) const { return nodes[nid].edges_end; }
// iterate over all nodes // iterate over all nodes
auto Nodes() { return boost::make_iterator_range(nodes.begin(), nodes.end()); } auto Nodes() { return std::ranges::subrange(nodes.begin(), nodes.end()); }
auto Nodes() const { return boost::make_iterator_range(nodes.begin(), nodes.end()); } auto Nodes() const { return std::ranges::subrange(nodes.begin(), nodes.end()); }
NodeID GetID(const NodeT &node) const NodeID GetID(const NodeT &node) const
{ {