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

fix implicit type conversios

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-17 13:03:49 +02:00
parent 5be6ef380f
commit 438d1af12a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/StaticGraph.h
View File

@ -122,8 +122,8 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
StaticGraph(typename ShM<NodeArrayEntry, UseSharedMemory>::vector &nodes, StaticGraph(typename ShM<NodeArrayEntry, UseSharedMemory>::vector &nodes,
typename ShM<EdgeArrayEntry, UseSharedMemory>::vector &edges) typename ShM<EdgeArrayEntry, UseSharedMemory>::vector &edges)
{ {
number_of_nodes = nodes.size() - 1; number_of_nodes = static_cast<decltype(number_of_nodes)>(nodes.size() - 1);
number_of_edges = edges.size(); number_of_edges = static_cast<decltype(number_of_edges)>(edges.size());
node_array.swap(nodes); node_array.swap(nodes);
edge_array.swap(edges); edge_array.swap(edges);

2
Server/DataStructures/SharedDataFacade.h
View File

@ -190,7 +190,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
typename ShM<char, true>::vector names_char_list( typename ShM<char, true>::vector names_char_list(
names_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_CHAR_LIST]); names_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_CHAR_LIST]);
m_name_table = osrm::make_unique<RangeTable<16, true>>( m_name_table = osrm::make_unique<RangeTable<16, true>>(
name_offsets, name_blocks, names_char_list.size()); name_offsets, name_blocks, static_cast<unsigned>(names_char_list.size()));
m_names_char_list.swap(names_char_list); m_names_char_list.swap(names_char_list);
} }