Skip to content

Commit 01605f7

Browse files
authored
Compilation fixes (#7263)
1 parent 145f6de commit 01605f7

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

include/engine/datafacade/contiguous_internalmem_datafacade.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
167167
util::vector_view<TurnPenalty> m_turn_duration_penalties;
168168
extractor::SegmentDataView segment_data;
169169
extractor::EdgeBasedNodeDataView edge_based_node_data;
170-
std::optional<guidance::TurnDataView> turn_data;
170+
std::optional<osrm::guidance::TurnDataView> turn_data;
171171

172172
std::optional<util::vector_view<util::guidance::LaneTupleIdPair>> m_lane_tuple_id_pairs;
173173

@@ -518,12 +518,13 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
518518
return intersection_bearings_view->GetBearingClass(node_based_node_id);
519519
}
520520

521-
guidance::TurnBearing PreTurnBearing(const EdgeID edge_based_edge_id) const override final
521+
osrm::guidance::TurnBearing PreTurnBearing(const EdgeID edge_based_edge_id) const override final
522522
{
523523
CHECK_DATASET_DISABLED(turn_data, DATASET_TURN_DATA);
524524
return turn_data->GetPreTurnBearing(edge_based_edge_id);
525525
}
526-
guidance::TurnBearing PostTurnBearing(const EdgeID edge_based_edge_id) const override final
526+
osrm::guidance::TurnBearing
527+
PostTurnBearing(const EdgeID edge_based_edge_id) const override final
527528
{
528529
CHECK_DATASET_DISABLED(turn_data, DATASET_TURN_DATA);
529530
return turn_data->GetPostTurnBearing(edge_based_edge_id);

include/engine/routing_algorithms/routing_base_mld.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "engine/routing_algorithms/routing_base.hpp"
77
#include "engine/search_engine_data.hpp"
88

9+
#include "util/for_each_pair.hpp"
910
#include "util/typedefs.hpp"
1011

1112
#include <boost/assert.hpp>

include/engine/routing_algorithms/tile_turns.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct TurnData final
2020
const int turn_angle;
2121
const EdgeWeight weight;
2222
const EdgeDuration duration;
23-
const guidance::TurnInstruction turn_instruction;
23+
const osrm::guidance::TurnInstruction turn_instruction;
2424
};
2525

2626
using RTreeLeaf = datafacade::BaseDataFacade::RTreeLeaf;

include/util/json_renderer.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,35 +105,35 @@ template <typename Out> struct Renderer
105105
Out &out;
106106
};
107107

108-
template <> void Renderer<std::vector<char>>::write(std::string_view str)
108+
template <> inline void Renderer<std::vector<char>>::write(std::string_view str)
109109
{
110110
out.insert(out.end(), str.begin(), str.end());
111111
}
112112

113-
template <> void Renderer<std::vector<char>>::write(const char *str, size_t size)
113+
template <> inline void Renderer<std::vector<char>>::write(const char *str, size_t size)
114114
{
115115
out.insert(out.end(), str, str + size);
116116
}
117117

118-
template <> void Renderer<std::vector<char>>::write(char ch) { out.push_back(ch); }
118+
template <> inline void Renderer<std::vector<char>>::write(char ch) { out.push_back(ch); }
119119

120-
template <> void Renderer<std::ostream>::write(std::string_view str) { out << str; }
120+
template <> inline void Renderer<std::ostream>::write(std::string_view str) { out << str; }
121121

122-
template <> void Renderer<std::ostream>::write(const char *str, size_t size)
122+
template <> inline void Renderer<std::ostream>::write(const char *str, size_t size)
123123
{
124124
out.write(str, size);
125125
}
126126

127-
template <> void Renderer<std::ostream>::write(char ch) { out << ch; }
127+
template <> inline void Renderer<std::ostream>::write(char ch) { out << ch; }
128128

129-
template <> void Renderer<std::string>::write(std::string_view str) { out += str; }
129+
template <> inline void Renderer<std::string>::write(std::string_view str) { out += str; }
130130

131-
template <> void Renderer<std::string>::write(const char *str, size_t size)
131+
template <> inline void Renderer<std::string>::write(const char *str, size_t size)
132132
{
133133
out.append(str, size);
134134
}
135135

136-
template <> void Renderer<std::string>::write(char ch) { out += ch; }
136+
template <> inline void Renderer<std::string>::write(char ch) { out += ch; }
137137

138138
inline void render(std::ostream &out, const Object &object)
139139
{

0 commit comments

Comments
 (0)