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

Use pair instead of tuple for implicit construction

Browse Source
This commit is contained in:
Patrick Niklaus 2018-03-22 16:12:18 +00:00
parent bde51a9ef5
commit 921235b2dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/storage.cpp
View File

@ -323,7 +323,7 @@ void Storage::PopulateLayout(DataLayout &layout)
constexpr bool REQUIRED = true; constexpr bool REQUIRED = true;
constexpr bool OPTIONAL = false; constexpr bool OPTIONAL = false;
std::vector<std::tuple<bool, boost::filesystem::path>> tar_files = { std::vector<std::pair<bool, boost::filesystem::path>> tar_files = {
{OPTIONAL, config.GetPath(".osrm.mldgr")}, {OPTIONAL, config.GetPath(".osrm.mldgr")},
{OPTIONAL, config.GetPath(".osrm.cells")}, {OPTIONAL, config.GetPath(".osrm.cells")},
{OPTIONAL, config.GetPath(".osrm.partition")}, {OPTIONAL, config.GetPath(".osrm.partition")},
@ -347,13 +347,13 @@ void Storage::PopulateLayout(DataLayout &layout)
for (const auto &file : tar_files) for (const auto &file : tar_files)
{ {
if (boost::filesystem::exists(std::get<1>(file))) if (boost::filesystem::exists(file.second))
{ {
readBlocks(std::get<1>(file), std::back_inserter(blocks)); readBlocks(file.second, std::back_inserter(blocks));
} }
else else
{ {
if (std::get<0>(file) == REQUIRED) if (file.first == REQUIRED)
{ {
throw util::exception("Could not find required filed: " + throw util::exception("Could not find required filed: " +
std::get<1>(file).string()); std::get<1>(file).string());