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

Fix c++ formatting

Browse Source
This commit is contained in:
Michael Krasnyk
2017-01-03 22:11:59 +01:00
committed by Moritz Kobitzsch
parent 2640a319c1
commit 24ab71a346
12 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/data_watchdog.hpp
+2 -5
View File
@@ -52,7 +52,6 @@ class DataWatchdog
const auto shared_timestamp =
static_cast<const storage::SharedDataTimestamp *>(shared_regions->Ptr());
const auto get_locked_facade = [this, shared_timestamp](
const std::shared_ptr<datafacade::SharedMemoryDataFacade> &facade) {
if (current_timestamp.region == storage::REGION_1)
@@ -117,10 +116,8 @@ class DataWatchdog
current_timestamp = *shared_timestamp;
}
auto new_facade =
std::make_shared<datafacade::SharedMemoryDataFacade>(shared_barriers,
current_timestamp.region,
current_timestamp.timestamp);
auto new_facade = std::make_shared<datafacade::SharedMemoryDataFacade>(
shared_barriers, current_timestamp.region, current_timestamp.timestamp);
cached_facade = new_facade;
return get_locked_facade(new_facade);
include/engine/datafacade/shared_memory_datafacade.hpp
+4 -2
View File
@@ -72,7 +72,8 @@ class SharedMemoryDataFacade : public ContiguousInternalMemoryDataFacadeBase
SharedMemoryDataFacade(const std::shared_ptr<storage::SharedBarriers> &shared_barriers_,
storage::SharedDataType data_region_,
unsigned shared_timestamp_)
: shared_barriers(shared_barriers_), data_region(data_region_), shared_timestamp(shared_timestamp_)
: shared_barriers(shared_barriers_), data_region(data_region_),
shared_timestamp(shared_timestamp_)
{
util::Log(logDEBUG) << "Loading new data with shared timestamp " << shared_timestamp;
@@ -80,7 +81,8 @@ class SharedMemoryDataFacade : public ContiguousInternalMemoryDataFacadeBase
m_large_memory = storage::makeSharedMemory(data_region);
InitializeInternalPointers(*reinterpret_cast<storage::DataLayout *>(m_large_memory->Ptr()),
reinterpret_cast<char *>(m_large_memory->Ptr()) + sizeof(storage::DataLayout));
reinterpret_cast<char *>(m_large_memory->Ptr()) +
sizeof(storage::DataLayout));
}
};
}