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

clang-format

Browse Source
This commit is contained in:
Pepijn Schoen 2017-04-13 11:48:11 +02:00 committed by Patrick Niklaus
parent 4929d1297e
commit 8ff5a22799
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/contractor/files.hpp
View File

@ -62,7 +62,6 @@ inline void writeLevels(const boost::filesystem::path &path, const std::vector<f
storage::serialization::write(writer, node_levels);
}
}
}
}

3
include/engine/engine.hpp
View File

@ -185,7 +185,8 @@ bool Engine<routing_algorithms::corech::Algorithm>::CheckCompability(const Engin
auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr());
return layout->GetBlockSize(storage::DataLayout::CH_CORE_MARKER) > sizeof(std::uint64_t) + sizeof(util::FingerPrint);
return layout->GetBlockSize(storage::DataLayout::CH_CORE_MARKER) >
sizeof(std::uint64_t) + sizeof(util::FingerPrint);
}
else
{

12
include/storage/io.hpp
View File

@ -72,10 +72,13 @@ class FileReader
// restore the current position
input_stream.seekg(positon, std::ios::beg);
if(fingerprint == FingerprintFlag::VerifyFingerprint) {
return std::size_t(file_size) - sizeof(util::FingerPrint);
} else {
return file_size;
if (fingerprint == FingerprintFlag::VerifyFingerprint)
{
return std::size_t(file_size) - sizeof(util::FingerPrint);
}
else
{
return file_size;
}
}
@ -168,7 +171,6 @@ class FileReader
const boost::filesystem::path filepath;
boost::filesystem::ifstream input_stream;
FingerprintFlag fingerprint;
};
class FileWriter

6
src/storage/storage.cpp
View File

@ -394,7 +394,8 @@ void Storage::PopulateLayout(DataLayout &layout)
{
// Loading turn lane data
io::FileReader lane_data_file(config.turn_lane_data_path, io::FileReader::VerifyFingerprint);
io::FileReader lane_data_file(config.turn_lane_data_path,
io::FileReader::VerifyFingerprint);
const auto lane_tuple_count = lane_data_file.ReadElementCount64();
layout.SetBlockSize<util::guidance::LaneTupleIdPair>(DataLayout::TURN_LANE_DATA,
lane_tuple_count);
@ -541,7 +542,8 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
// Turn lane data
{
io::FileReader lane_data_file(config.turn_lane_data_path, io::FileReader::VerifyFingerprint);
io::FileReader lane_data_file(config.turn_lane_data_path,
io::FileReader::VerifyFingerprint);
const auto lane_tuple_count = lane_data_file.ReadElementCount64();