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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/engine/data_watchdog.hpp
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);

6
include/engine/datafacade/shared_memory_datafacade.hpp
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));
}
};
}

11
include/extractor/guidance/intersection.hpp
View File

@ -14,9 +14,9 @@
#include "extractor/guidance/turn_instruction.hpp"
#include <boost/range/algorithm/min_element.hpp>
#include <boost/range/algorithm/find_if.hpp>
#include <boost/range/algorithm/count_if.hpp>
#include <boost/range/algorithm/find_if.hpp>
#include <boost/range/algorithm/min_element.hpp>
namespace osrm
{
@ -133,8 +133,7 @@ template <typename Self> struct EnableShapeOps
// search a given eid in the intersection
auto FindEid(const EdgeID eid) const
{
return boost::range::find_if(
*self(), [eid](const auto &road) { return road.eid == eid; });
return boost::range::find_if(*self(), [eid](const auto &road) { return road.eid == eid; });
}
// find the maximum value based on a conversion operator
@ -247,8 +246,8 @@ template <typename Self> struct EnableIntersectionOps
auto findClosestTurn(const double angle, const UnaryPredicate filter) const
{
BOOST_ASSERT(!self()->empty());
const auto candidate = boost::range::min_element(
*self(), [angle, &filter](const auto &lhs, const auto &rhs) {
const auto candidate =
boost::range::min_element(*self(), [angle, &filter](const auto &lhs, const auto &rhs) {
const auto filtered_lhs = filter(lhs), filtered_rhs = filter(rhs);
const auto deviation_lhs = util::angularDeviation(lhs.angle, angle),
deviation_rhs = util::angularDeviation(rhs.angle, angle);

5
include/extractor/guidance/mergable_road_detector.hpp
View File

@ -13,10 +13,10 @@
namespace osrm
{
//FWD declarations
// FWD declarations
namespace util
{
class NameTable;
class NameTable;
} // namespace util
namespace extractor
@ -30,7 +30,6 @@ namespace guidance
class IntersectionGenerator;
class CoordinateExtractor;
class MergableRoadDetector
{
public:

2
src/extractor/guidance/mergable_road_detector.cpp
View File

@ -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);
};

2
src/extractor/guidance/sliproad_handler.cpp
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>

2
src/extractor/guidance/turn_handler.cpp
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"

6
src/storage/storage.cpp
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);

2
src/tools/contract.cpp
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;

2
src/tools/extract.cpp
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;

2
src/tools/routed.cpp
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;

2
src/tools/store.cpp
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);