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

Fixed regression

Browse Source
This commit is contained in:
Pepijn Schoen 2017-03-31 15:30:00 +02:00 committed by Patrick Niklaus
parent 427437d49b
commit b21ee1b63b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
View File

@ -155,7 +155,7 @@ class ContiguousInternalMemoryAlgorithmDataFacade<algorithm::CoreCH>
: public datafacade::AlgorithmDataFacade<algorithm::CoreCH> : public datafacade::AlgorithmDataFacade<algorithm::CoreCH>
{ {
private: private:
util::SharedMemoryVector<unsigned> m_is_core_node; util::ShM<bool, osrm::storage::MemorySetting::SharedMemory>::vector m_is_core_node;
// allocator that keeps the allocation data // allocator that keeps the allocation data
std::shared_ptr<ContiguousBlockAllocator> allocator; std::shared_ptr<ContiguousBlockAllocator> allocator;
@ -164,7 +164,7 @@ class ContiguousInternalMemoryAlgorithmDataFacade<algorithm::CoreCH>
{ {
auto core_marker_ptr = auto core_marker_ptr =
data_layout.GetBlockPtr<unsigned>(memory_block, storage::DataLayout::CH_CORE_MARKER); data_layout.GetBlockPtr<unsigned>(memory_block, storage::DataLayout::CH_CORE_MARKER);
util::SharedMemoryVector<unsigned> is_core_node( util::ShM<bool, osrm::storage::MemorySetting::SharedMemory>::vector is_core_node(
core_marker_ptr, data_layout.num_entries[storage::DataLayout::CH_CORE_MARKER]); core_marker_ptr, data_layout.num_entries[storage::DataLayout::CH_CORE_MARKER]);
m_is_core_node = std::move(is_core_node); m_is_core_node = std::move(is_core_node);
} }

2
unit_tests/util/static_graph.cpp
View File

@ -71,7 +71,7 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
} }
typename util::InternalMemoryVector<TestNodeArrayEntry> nodes; typename util::InternalMemoryVector<TestNodeArrayEntry> nodes;
typename InternalMemoryVector<TestEdgeArrayEntry> edges; typename util::InternalMemoryVector<TestEdgeArrayEntry> edges;
std::vector<unsigned> lengths; std::vector<unsigned> lengths;
std::vector<unsigned> order; std::vector<unsigned> order;
}; };