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

Sync with Clang38 Format

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-06-02 13:14:33 +02:00
parent c490752ca7
commit 448f8377fb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/engine/guidance/assemble_leg.hpp
View File

@ -92,7 +92,6 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
}); });
segments.resize(new_end - segments.begin()); segments.resize(new_end - segments.begin());
// sort descending // sort descending
std::sort( std::sort(
segments.begin(), segments.end(), [](const NamedSegment &lhs, const NamedSegment &rhs) { segments.begin(), segments.end(), [](const NamedSegment &lhs, const NamedSegment &rhs) {

2
include/extractor/extractor_callbacks.hpp
View File

@ -2,8 +2,8 @@
#define EXTRACTOR_CALLBACKS_HPP #define EXTRACTOR_CALLBACKS_HPP
#include "util/typedefs.hpp" #include "util/typedefs.hpp"
#include <boost/optional/optional_fwd.hpp>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include <boost/optional/optional_fwd.hpp>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>

2
src/engine/api/json_factory.cpp
View File

@ -199,7 +199,7 @@ util::json::Object makeRouteStep(guidance::RouteStep step, util::json::Value geo
if (!step.pronunciation.empty()) if (!step.pronunciation.empty())
route_step.values["pronunciation"] = std::move(step.pronunciation); route_step.values["pronunciation"] = std::move(step.pronunciation);
if (!step.destinations.empty()) if (!step.destinations.empty())
route_step.values["destinations"] = std::move(step.destinations); route_step.values["destinations"] = std::move(step.destinations);
if (!step.rotary_name.empty()) if (!step.rotary_name.empty())
route_step.values["rotary_name"] = std::move(step.rotary_name); route_step.values["rotary_name"] = std::move(step.rotary_name);

11
src/extractor/extractor_callbacks.cpp
View File

@ -152,11 +152,13 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
if (string_map.end() == name_iterator) if (string_map.end() == name_iterator)
{ {
auto name_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.name.size()); auto name_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.name.size());
auto destinations_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.destinations.size()); auto destinations_length =
auto pronunciation_length = std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.pronunciation.size()); std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.destinations.size());
auto pronunciation_length =
std::min<unsigned>(MAX_STRING_LENGTH, parsed_way.pronunciation.size());
external_memory.name_char_data.reserve(name_id + name_length + destinations_length +
external_memory.name_char_data.reserve(name_id + name_length + destinations_length + pronunciation_length); pronunciation_length);
std::copy(parsed_way.name.c_str(), std::copy(parsed_way.name.c_str(),
parsed_way.name.c_str() + name_length, parsed_way.name.c_str() + name_length,
@ -166,7 +168,6 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
parsed_way.destinations.c_str() + destinations_length, parsed_way.destinations.c_str() + destinations_length,
std::back_inserter(external_memory.name_char_data)); std::back_inserter(external_memory.name_char_data));
std::copy(parsed_way.pronunciation.c_str(), std::copy(parsed_way.pronunciation.c_str(),
parsed_way.pronunciation.c_str() + pronunciation_length, parsed_way.pronunciation.c_str() + pronunciation_length,
std::back_inserter(external_memory.name_char_data)); std::back_inserter(external_memory.name_char_data));