rename osrm_input_path to osrm_path, clang-format

This commit is contained in:
Pepijn Schoen
2017-05-05 10:23:09 +02:00
committed by Daniel J. H
parent 1b31099f73
commit 67fae1d1f0
11 changed files with 52 additions and 58 deletions
+4 -4
View File
@@ -79,7 +79,7 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
boost::program_options::options_description hidden_options("Hidden options");
hidden_options.add_options()(
"input,i",
boost::program_options::value<boost::filesystem::path>(&contractor_config.osrm_input_path),
boost::program_options::value<boost::filesystem::path>(&contractor_config.osrm_path),
"Input file in .osm, .osm.bz2 or .osm.pbf format");
// positional option
@@ -169,14 +169,14 @@ int main(int argc, char *argv[]) try
<< "! This setting may have performance side-effects.";
}
if (!boost::filesystem::is_regular_file(contractor_config.osrm_input_path))
if (!boost::filesystem::is_regular_file(contractor_config.osrm_path))
{
util::Log(logERROR) << "Input file " << contractor_config.osrm_input_path.string()
util::Log(logERROR) << "Input file " << contractor_config.osrm_path.string()
<< " not found!";
return EXIT_FAILURE;
}
util::Log() << "Input file: " << contractor_config.osrm_input_path.filename().string();
util::Log() << "Input file: " << contractor_config.osrm_path.filename().string();
util::Log() << "Threads: " << contractor_config.requested_num_threads;
tbb::task_scheduler_init init(contractor_config.requested_num_threads);