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

fix compilation of tests

Browse Source
This commit is contained in:
Emil Tin 2014-08-12 19:36:59 +02:00 committed by Emil Tin
parent 6e1ab9fe3a
commit 4dd0377eb8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Descriptors/DescriptionFactory.cpp
View File

@ -59,7 +59,8 @@ void DescriptionFactory::SetEndSegment(const PhantomNode &target,
target_phantom = target; target_phantom = target;
const EdgeWeight segment_duration = const EdgeWeight segment_duration =
(traversed_in_reverse ? target.reverse_weight : target.forward_weight); (traversed_in_reverse ? target.reverse_weight : target.forward_weight);
<<<<<<< HEAD const TravelMode travel_mode =
(traversed_in_reverse ? target.backward_travel_mode : target.travel_mode);
path_description.emplace_back(target.location, path_description.emplace_back(target.location,
target.name_id, target.name_id,
segment_duration, segment_duration,

4
UnitTests/DataStructures/StaticRTreeTest.cpp
View File

@ -109,7 +109,9 @@ class LinearSearchNN
e.reverse_offset, e.reverse_offset,
e.packed_geometry_id, e.packed_geometry_id,
nearest, nearest,
e.fwd_segment_position}; e.fwd_segment_position,
e.travel_mode,
e.backward_travel_mode};
nearest_edge = e; nearest_edge = e;
} }
} }