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

First pass at adjustment for comments

Browse Source
This commit is contained in:
Pepijn Schoen
2017-03-31 12:27:56 +02:00
committed by Patrick Niklaus
parent 157ca9161f
commit 01deefc3bc
4 changed files with 3 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+2 -2
View File
@@ -155,7 +155,7 @@ class ContiguousInternalMemoryAlgorithmDataFacade<algorithm::CoreCH>
: public datafacade::AlgorithmDataFacade<algorithm::CoreCH>
{
private:
util::ShM<unsigned, osrm::storage::MemorySetting::SharedMemory>::vector m_is_core_node;
util::ShM<bool, osrm::storage::MemorySetting::SharedMemory>::vector m_is_core_node;
// allocator that keeps the allocation data
std::shared_ptr<ContiguousBlockAllocator> allocator;
@@ -164,7 +164,7 @@ class ContiguousInternalMemoryAlgorithmDataFacade<algorithm::CoreCH>
{
auto core_marker_ptr =
data_layout.GetBlockPtr<unsigned>(memory_block, storage::DataLayout::CH_CORE_MARKER);
util::ShM<unsigned, osrm::storage::MemorySetting::SharedMemory>::vector 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]);
m_is_core_node = std::move(is_core_node);
}
include/engine/datafacade/contiguous_internalmem_datafacade.hpp~RF1bba25.TMP
-1087
View File
File diff suppressed because it is too large Load Diff
include/util/shared_memory_vector_wrapper.hpp
+1 -1
View File
@@ -132,7 +132,7 @@ template <typename DataT> class SharedMemoryWrapper
friend void swap(SharedMemoryWrapper<T> &, SharedMemoryWrapper<T> &) noexcept;
};
template <> class SharedMemoryWrapper<osrm::storage::MemorySetting>
template <> class SharedMemoryWrapper<bool>
{
private:
unsigned *m_ptr;