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

Fix formating

Browse Source
This commit is contained in:
Patrick Niklaus 2018-04-06 00:50:12 +00:00 committed by Patrick Niklaus
parent a915542916
commit 29d1b34140
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/engine/data_watchdog.hpp
View File

@ -59,7 +59,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
facade_factory = facade_factory =
DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>( DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
std::make_shared<datafacade::SharedMemoryAllocator>( std::make_shared<datafacade::SharedMemoryAllocator>(
std::vector<storage::SharedRegionRegister::ShmKey> {static_region.shm_key, updatable_region.shm_key})); std::vector<storage::SharedRegionRegister::ShmKey>{
static_region.shm_key, updatable_region.shm_key}));
} }
watcher = std::thread(&DataWatchdogImpl::Run, this); watcher = std::thread(&DataWatchdogImpl::Run, this);
@ -113,7 +114,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
facade_factory = facade_factory =
DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>( DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
std::make_shared<datafacade::SharedMemoryAllocator>( std::make_shared<datafacade::SharedMemoryAllocator>(
std::vector<storage::SharedRegionRegister::ShmKey>{static_region.shm_key, updatable_region.shm_key})); std::vector<storage::SharedRegionRegister::ShmKey>{
static_region.shm_key, updatable_region.shm_key}));
} }
util::Log() << "DataWatchdog thread stopped"; util::Log() << "DataWatchdog thread stopped";

3
include/engine/datafacade/shared_memory_allocator.hpp
View File

@ -23,7 +23,8 @@ namespace datafacade
class SharedMemoryAllocator : public ContiguousBlockAllocator class SharedMemoryAllocator : public ContiguousBlockAllocator
{ {
public: public:
explicit SharedMemoryAllocator(const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys); explicit SharedMemoryAllocator(
const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys);
~SharedMemoryAllocator() override final; ~SharedMemoryAllocator() override final;
// interface to give access to the datafacades // interface to give access to the datafacades

2
include/storage/storage.hpp
View File

@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef STORAGE_HPP #ifndef STORAGE_HPP
#define STORAGE_HPP #define STORAGE_HPP
#include "storage/shared_datatype.hpp"
#include "storage/shared_data_index.hpp" #include "storage/shared_data_index.hpp"
#include "storage/shared_datatype.hpp"
#include "storage/storage_config.hpp" #include "storage/storage_config.hpp"
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>

3
include/storage/view_factory.hpp
View File

@ -51,7 +51,8 @@ util::vector_view<T> make_vector_view(const SharedDataIndex &index, const std::s
} }
template <> template <>
inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index, const std::string &name) inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index,
const std::string &name)
{ {
return util::vector_view<bool>(index.GetBlockPtr<util::vector_view<bool>::Word>(name), return util::vector_view<bool>(index.GetBlockPtr<util::vector_view<bool>::Word>(name),
index.GetBlockEntries(name)); index.GetBlockEntries(name));