Fix c++ formatting

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
@@ -312,7 +312,7 @@ bool MergableRoadDetector::HaveSameDirection(const NodeID intersection_node,
*/
const auto prune = [](auto &data_vector) {
BOOST_ASSERT(data_vector.size() >= 3);
//erase the first third of the vector
// erase the first third of the vector
data_vector.erase(data_vector.begin(), data_vector.begin() + data_vector.size() / 3);
};
+1 -1
View File
@@ -4,8 +4,8 @@
#include "util/coordinate_calculation.hpp"
#include "util/guidance/name_announcements.hpp"
#include <cmath>
#include <algorithm>
#include <cmath>
#include <iterator>
#include <limits>
+1 -1
View File
@@ -1,5 +1,5 @@
#include "extractor/guidance/constants.hpp"
#include "extractor/guidance/turn_handler.hpp"
#include "extractor/guidance/constants.hpp"
#include "util/bearing.hpp"
#include "util/guidance/name_announcements.hpp"
+2 -4
View File
@@ -73,10 +73,8 @@ RegionsLayout getRegionsLayout(SharedBarriers &barriers)
static_cast<const SharedDataTimestamp *>(shared_region->Ptr());
if (shared_timestamp->region == REGION_1)
{
return RegionsLayout{REGION_1,
barriers.region_1_mutex,
REGION_2,
barriers.region_2_mutex};
return RegionsLayout{
REGION_1, barriers.region_1_mutex, REGION_2, barriers.region_2_mutex};
}
BOOST_ASSERT(shared_timestamp->region == REGION_2);
+1 -1
View File
@@ -179,7 +179,7 @@ catch (const std::bad_alloc &e)
util::Log(logERROR) << "Please provide more memory or consider using a larger swapfile";
return EXIT_FAILURE;
}
catch (const std::exception& e)
catch (const std::exception &e)
{
std::cerr << "[exception] " << e.what();
return EXIT_FAILURE;
+1 -1
View File
@@ -167,7 +167,7 @@ catch (const std::bad_alloc &e)
util::Log(logERROR) << "Please provide more memory or consider using a larger swapfile";
return EXIT_FAILURE;
}
catch (const std::exception& e)
catch (const std::exception &e)
{
std::cerr << "[exception] " << e.what();
return EXIT_FAILURE;
+1 -1
View File
@@ -373,7 +373,7 @@ catch (const std::bad_alloc &e)
util::Log(logWARNING) << "Please provide more memory or consider using a larger swapfile";
return EXIT_FAILURE;
}
catch (const std::exception& e)
catch (const std::exception &e)
{
std::cerr << "[exception] " << e.what();
return EXIT_FAILURE;
+1 -1
View File
@@ -91,7 +91,7 @@ bool generateDataStoreOptions(const int argc,
return true;
}
[[ noreturn ]] void CleanupSharedBarriers(int signum)
[[noreturn]] void CleanupSharedBarriers(int signum)
{ // Here the lock state of named mutexes is unknown, make a hard cleanup
osrm::storage::SharedBarriers::resetCurrentRegion();
std::_Exit(128 + signum);