Skip to content

Commit 6cf0a46

Browse files
car_parking: rename foot alias to footp
prevents warnings / errors in GCC alias changes meaning
1 parent 02a5bb8 commit 6cf0a46

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

include/osr/routing/profiles/car_parking.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace osr {
1515

1616
template <bool IsWheelchair>
1717
struct car_parking {
18-
using foot = foot<IsWheelchair>;
18+
using footp = foot<IsWheelchair>;
1919

2020
static constexpr auto const kSwitchPenalty = cost_t{200U};
2121
static constexpr auto const kMaxMatchDistance = car::kMaxMatchDistance;
@@ -187,7 +187,7 @@ struct car_parking {
187187
return {.n_ = n.n_, .way_ = n.way_, .dir_ = n.dir_};
188188
}
189189

190-
static foot::node to_foot(node const n) {
190+
static footp::node to_foot(node const n) {
191191
return {.n_ = n.n_, .lvl_ = n.lvl_};
192192
}
193193

@@ -199,7 +199,7 @@ struct car_parking {
199199
.way_ = n.way_};
200200
}
201201

202-
static node to_node(foot::node const n) {
202+
static node to_node(footp::node const n) {
203203
return {.n_ = n.n_,
204204
.type_ = node_type::kFoot,
205205
.lvl_ = n.lvl_,
@@ -212,8 +212,8 @@ struct car_parking {
212212
node_idx_t const n,
213213
level_t const lvl,
214214
Fn&& f) {
215-
foot::resolve_all(w, n, lvl,
216-
[&](foot::node const neighbor) { f(to_node(neighbor)); });
215+
footp::resolve_all(
216+
w, n, lvl, [&](footp::node const neighbor) { f(to_node(neighbor)); });
217217
car::resolve_all(w, n, lvl, [&](car::node const neighbor) {
218218
auto const p = w.way_properties_[w.node_ways_[n][neighbor.way_]];
219219
auto const node_level = lvl == level_t::invalid() ? p.from_level() : lvl;
@@ -232,9 +232,9 @@ struct car_parking {
232232
auto const is_parking = w.node_properties_[n.n_].is_parking();
233233

234234
if (n.is_foot_node() || (kFwd && n.is_car_node() && is_parking)) {
235-
foot::template adjacent<SearchDir, WithBlocked>(
235+
footp::template adjacent<SearchDir, WithBlocked>(
236236
w, to_foot(n), blocked,
237-
[&](foot::node const neighbor, std::uint32_t const cost,
237+
[&](footp::node const neighbor, std::uint32_t const cost,
238238
distance_t const dist, way_idx_t const way,
239239
std::uint16_t const from, std::uint16_t const to) {
240240
fn(to_node(neighbor),
@@ -277,9 +277,9 @@ struct car_parking {
277277
: lvl;
278278
f(to_node(cn, node_level));
279279
})
280-
: foot::resolve_start_node(
280+
: footp::resolve_start_node(
281281
w, way, n, lvl, search_dir,
282-
[&](foot::node const fn) { f(to_node(fn)); });
282+
[&](footp::node const fn) { f(to_node(fn)); });
283283
}
284284

285285
static bool is_dest_reachable(ways::routing const& w,
@@ -290,8 +290,8 @@ struct car_parking {
290290
return w.way_properties_[way].is_parking() ||
291291
(search_dir == direction::kBackward
292292
? n.is_foot_node() &&
293-
foot::is_dest_reachable(w, to_foot(n), way, way_dir,
294-
search_dir)
293+
footp::is_dest_reachable(w, to_foot(n), way, way_dir,
294+
search_dir)
295295
: n.is_car_node() &&
296296
car::is_dest_reachable(w, to_car(n), way, way_dir,
297297
search_dir));
@@ -300,7 +300,7 @@ struct car_parking {
300300
static constexpr cost_t way_cost(way_properties const& e,
301301
direction const dir,
302302
std::uint16_t const dist) {
303-
return foot::way_cost(e, dir, dist);
303+
return footp::way_cost(e, dir, dist);
304304
}
305305
};
306306

0 commit comments

Comments
 (0)