Merge pull request #2733 from gavinsherry/master

Remove unused variable node_info_list
This commit is contained in:
Patrick Niklaus 2016-08-04 11:24:33 +02:00 committed by GitHub
commit 6bfe3a2d41
3 changed files with 3 additions and 6 deletions

View File

@ -39,7 +39,6 @@ class TurnLaneHandler
TurnLaneHandler(const util::NodeBasedDynamicGraph &node_based_graph, TurnLaneHandler(const util::NodeBasedDynamicGraph &node_based_graph,
const std::vector<std::uint32_t> &turn_lane_offsets, const std::vector<std::uint32_t> &turn_lane_offsets,
const std::vector<TurnLaneType::Mask> &turn_lane_masks, const std::vector<TurnLaneType::Mask> &turn_lane_masks,
const std::vector<QueryNode> &node_info_list,
const TurnAnalysis &turn_analysis); const TurnAnalysis &turn_analysis);
OSRM_ATTR_WARN_UNUSED OSRM_ATTR_WARN_UNUSED
@ -54,7 +53,6 @@ class TurnLaneHandler
const util::NodeBasedDynamicGraph &node_based_graph; const util::NodeBasedDynamicGraph &node_based_graph;
const std::vector<std::uint32_t> &turn_lane_offsets; const std::vector<std::uint32_t> &turn_lane_offsets;
const std::vector<TurnLaneType::Mask> &turn_lane_masks; const std::vector<TurnLaneType::Mask> &turn_lane_masks;
const std::vector<QueryNode> &node_info_list;
const TurnAnalysis &turn_analysis; const TurnAnalysis &turn_analysis;
// check whether we can handle an intersection // check whether we can handle an intersection

View File

@ -344,7 +344,7 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
name_table, name_table,
street_name_suffix_table); street_name_suffix_table);
guidance::lanes::TurnLaneHandler turn_lane_handler( guidance::lanes::TurnLaneHandler turn_lane_handler(
*m_node_based_graph, turn_lane_offsets, turn_lane_masks, m_node_info_list, turn_analysis); *m_node_based_graph, turn_lane_offsets, turn_lane_masks, turn_analysis);
bearing_class_by_node_based_node.resize(m_node_based_graph->GetNumberOfNodes(), bearing_class_by_node_based_node.resize(m_node_based_graph->GetNumberOfNodes(),
std::numeric_limits<std::uint32_t>::max()); std::numeric_limits<std::uint32_t>::max());

View File

@ -33,10 +33,9 @@ std::size_t getNumberOfTurns(const Intersection &intersection)
TurnLaneHandler::TurnLaneHandler(const util::NodeBasedDynamicGraph &node_based_graph, TurnLaneHandler::TurnLaneHandler(const util::NodeBasedDynamicGraph &node_based_graph,
const std::vector<std::uint32_t> &turn_lane_offsets, const std::vector<std::uint32_t> &turn_lane_offsets,
const std::vector<TurnLaneType::Mask> &turn_lane_masks, const std::vector<TurnLaneType::Mask> &turn_lane_masks,
const std::vector<QueryNode> &node_info_list,
const TurnAnalysis &turn_analysis) const TurnAnalysis &turn_analysis)
: node_based_graph(node_based_graph), turn_lane_offsets(turn_lane_offsets), : node_based_graph(node_based_graph), turn_lane_offsets(turn_lane_offsets),
turn_lane_masks(turn_lane_masks), node_info_list(node_info_list), turn_analysis(turn_analysis) turn_lane_masks(turn_lane_masks), turn_analysis(turn_analysis)
{ {
} }