diff options
| author | mvglasow <michael -at- vonglasow.com> | 2018-06-11 17:24:10 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2018-06-11 17:24:10 +0200 |
| commit | d2917f5b53b32be5a4a047dcfaf80ec09417307d (patch) | |
| tree | 49f1c91c95ba885a9e4d2d729e4506c5a98079be /navit | |
| parent | 13ba5bad4691fe4e8536549fcb216f28df702eec (diff) | |
| download | navit-d2917f5b53b32be5a4a047dcfaf80ec09417307d.tar.gz | |
Refactor:core:Remove temporary conditionals
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/route.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/navit/route.c b/navit/route.c index e22e75b40..20d0d3437 100644 --- a/navit/route.c +++ b/navit/route.c @@ -68,8 +68,6 @@ #include "roadprofile.h" #include "debug.h" -#define X_TURNAROUND_PENALTY - struct map_priv { struct route *route; }; @@ -2020,14 +2018,12 @@ static void route_graph_point_update(struct vehicleprofile *profile, struct rout for (s = p->start; s; s = s->start_next) { /* Iterate over all the segments leading away from our point */ val = route_value_seg(profile, s->end, s, 1); -#ifdef X_TURNAROUND_PENALTY if (val != INT_MAX && s->end->seg && item_is_equal(s->data.item, s->end->seg->data.item)) { if (profile->turn_around_penalty2) val += profile->turn_around_penalty2; else val = INT_MAX; } -#endif if (val != INT_MAX) { new = route_value_add(val, s->end->value); if (new < p->rhs) { @@ -2039,14 +2035,12 @@ static void route_graph_point_update(struct vehicleprofile *profile, struct rout for (s = p->end; s; s = s->end_next) { /* Iterate over all the segments leading towards our point */ val = route_value_seg(profile, s->start, s, -1); -#ifdef X_TURNAROUND_PENALTY if (val != INT_MAX && s->start->seg && item_is_equal(s->data.item, s->start->seg->data.item)) { if (profile->turn_around_penalty2) val += profile->turn_around_penalty2; else val = INT_MAX; } -#endif if (val != INT_MAX) { new = route_value_add(val, s->start->value); if (new < p->rhs) { |