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

Avoid copy of std::function-based callback in path unpacking (#6895)

Browse Source 
* Avoid copy of std::function-based callback in path unpacking

* Fix formatting

* Update CHANGELOG.md
This commit is contained in:
Dennis Luxen 2024-05-23 18:51:51 +02:00 committed by GitHub
parent ed5003b502
commit 51b74a99aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@
- NodeJS: - NodeJS:
- CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452) - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
- Misc: - Misc:
- CHANGED: Avoid copy of std::function-based callback in path unpacking [#6895](https://github.com/Project-OSRM/osrm-backend/pull/6895)
- CHANGED: Replace boost::hash by std::hash [#6892](https://github.com/Project-OSRM/osrm-backend/pull/6892) - CHANGED: Replace boost::hash by std::hash [#6892](https://github.com/Project-OSRM/osrm-backend/pull/6892)
- CHANGED: Partial fix migration from boost::optional to std::optional [#6551](https://github.com/Project-OSRM/osrm-backend/issues/6551) - CHANGED: Partial fix migration from boost::optional to std::optional [#6551](https://github.com/Project-OSRM/osrm-backend/issues/6551)
- CHANGED: Update Conan Boost version to 1.85.0. [#6868](https://github.com/Project-OSRM/osrm-backend/pull/6868) - CHANGED: Update Conan Boost version to 1.85.0. [#6868](https://github.com/Project-OSRM/osrm-backend/pull/6868)

2
include/engine/datafacade/algorithm_datafacade.hpp
View File

@ -55,7 +55,7 @@ template <> class AlgorithmDataFacade<CH>
virtual EdgeID FindSmallestEdge(const NodeID edge_based_node_from, virtual EdgeID FindSmallestEdge(const NodeID edge_based_node_from,
const NodeID edge_based_node_to, const NodeID edge_based_node_to,
const std::function<bool(EdgeData)> filter) const = 0; const std::function<bool(const EdgeData &)> &filter) const = 0;
}; };
template <> class AlgorithmDataFacade<MLD> template <> class AlgorithmDataFacade<MLD>

5
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
View File

@ -130,9 +130,10 @@ class ContiguousInternalMemoryAlgorithmDataFacade<CH> : public datafacade::Algor
edge_based_node_from, edge_based_node_to, result); edge_based_node_from, edge_based_node_to, result);
} }
EdgeID FindSmallestEdge(const NodeID edge_based_node_from, EdgeID
FindSmallestEdge(const NodeID edge_based_node_from,
const NodeID edge_based_node_to, const NodeID edge_based_node_to,
std::function<bool(EdgeData)> filter) const override final const std::function<bool(const EdgeData &)> &filter) const override final
{ {
return m_query_graph.FindSmallestEdge(edge_based_node_from, edge_based_node_to, filter); return m_query_graph.FindSmallestEdge(edge_based_node_from, edge_based_node_to, filter);
} }

5
unit_tests/mocks/mock_datafacade.hpp
View File

@ -238,9 +238,10 @@ class MockAlgorithmDataFacade<engine::datafacade::CH>
return SPECIAL_EDGEID; return SPECIAL_EDGEID;
} }
EdgeID FindSmallestEdge(const NodeID /* from */, EdgeID
FindSmallestEdge(const NodeID /* from */,
const NodeID /* to */, const NodeID /* to */,
std::function<bool(EdgeData)> /* filter */) const override const std::function<bool(const EdgeData &)> & /* filter */) const override
{ {
return SPECIAL_EDGEID; return SPECIAL_EDGEID;
} }