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

rename to vector_view, replace some missing ShM occurences

Browse Source
This commit is contained in:
Pepijn Schoen
2017-04-02 21:24:11 +02:00
committed by Patrick Niklaus
parent 703588b684
commit 87874006c7
4 changed files with 84 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/util/shared_memory_vector_wrapper.hpp
+1 -2
View File
@@ -184,8 +184,7 @@ template <typename DataT, osrm::storage::MemorySetting MemorySetting> struct ShM
};
template <typename DataT>
using SharedMemoryVector =
typename util::ShM<DataT, osrm::storage::MemorySetting::SharedMemory>::vector;
using vector_view = typename util::ShM<DataT, osrm::storage::MemorySetting::SharedMemory>::vector;
template <typename DataT>
using InternalMemoryVector =
typename util::ShM<DataT, osrm::storage::MemorySetting::InternalMemory>::vector;
include/util/static_graph.hpp
+2 -2
View File
@@ -126,8 +126,8 @@ class StaticGraph
InitializeFromSortedEdgeRange(nodes, edges.begin(), edges.end());
}
StaticGraph(typename ShM<NodeArrayEntry, MemorySetting>::vector node_array_,
typename ShM<EdgeArrayEntry, MemorySetting>::vector edge_array_)
StaticGraph(typename util::ShM<NodeArrayEntry, MemorySetting>::vector node_array_,
typename util::ShM<EdgeArrayEntry, MemorySetting>::vector edge_array_)
: node_array(std::move(node_array_)), edge_array(std::move(edge_array_))
{
BOOST_ASSERT(!node_array.empty());