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

Fixes signed/unsigned comparision spotted by gcc10.

Browse Source 
Fixed by moving assertion to the actual point where signed values are used.
This commit is contained in:
Denis Chaplygin 2020-06-17 11:21:37 +03:00
parent 365121dac4
commit 919fe74c40
No known key found for this signature in database
GPG Key ID: 20B3EDF942F8C943
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/engine/routing_algorithms/routing_base.hpp
View File

@ -192,17 +192,22 @@ void annotatePath(const FacadeT &facade,
const bool is_first_segment = unpacked_path.empty(); const bool is_first_segment = unpacked_path.empty();
const std::size_t start_index = std::size_t start_index = 0;
(is_first_segment ? ((start_traversed_in_reverse) if (is_first_segment)
? weight_vector.size() - {
phantom_node_pair.source_phantom.fwd_segment_position - 1 unsigned short segment_position = phantom_node_pair.source_phantom.fwd_segment_position;
: phantom_node_pair.source_phantom.fwd_segment_position) if (start_traversed_in_reverse)
: 0); {
segment_position = weight_vector.size() -
phantom_node_pair.source_phantom.fwd_segment_position - 1;
}
BOOST_ASSERT(segment_position >= 0);
start_index = static_cast<std::size_t>(segment_position);
}
const std::size_t end_index = weight_vector.size(); const std::size_t end_index = weight_vector.size();
bool is_left_hand_driving = facade.IsLeftHandDriving(node_id); bool is_left_hand_driving = facade.IsLeftHandDriving(node_id);
BOOST_ASSERT(start_index >= 0);
BOOST_ASSERT(start_index < end_index); BOOST_ASSERT(start_index < end_index);
for (std::size_t segment_idx = start_index; segment_idx < end_index; ++segment_idx) for (std::size_t segment_idx = start_index; segment_idx < end_index; ++segment_idx)
{ {