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

couple more explicit casts

Browse Source
This commit is contained in:
Dennis Luxen 2014-06-17 18:52:01 +02:00
parent e3d659576f
commit 39611f7477
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RoutingAlgorithms/AlternativePathRouting.h
View File

@ -271,8 +271,8 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
int length_of_via_path = 0, sharing_of_via_path = 0; int length_of_via_path = 0, sharing_of_via_path = 0;
ComputeLengthAndSharingOfViaPath( ComputeLengthAndSharingOfViaPath(
node, &length_of_via_path, &sharing_of_via_path, packed_shortest_path); node, &length_of_via_path, &sharing_of_via_path, packed_shortest_path);
const int maximum_allowed_sharing = const int maximum_allowed_sharing = static_cast<int>(
upper_bound_to_shortest_path_distance * VIAPATH_GAMMA; upper_bound_to_shortest_path_distance * VIAPATH_GAMMA);
if (sharing_of_via_path <= maximum_allowed_sharing && if (sharing_of_via_path <= maximum_allowed_sharing &&
length_of_via_path <= upper_bound_to_shortest_path_distance * (1 + VIAPATH_EPSILON)) length_of_via_path <= upper_bound_to_shortest_path_distance * (1 + VIAPATH_EPSILON))
{ {
@ -774,11 +774,12 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
int t_test_path_length = unpacked_until_distance; int t_test_path_length = unpacked_until_distance;
unpacked_until_distance = 0; unpacked_until_distance = 0;
// Traverse path s-->v // Traverse path s-->v
for (unsigned i = 0, packed_path_length = packed_v_t_path.size() - 1; BOOST_ASSERT(!packed_v_t_path.empty());
for (unsigned i = 0, packed_path_length = static_cast<unsigned>(packed_v_t_path.size() - 1);
(i < packed_path_length) && unpack_stack.empty(); (i < packed_path_length) && unpack_stack.empty();
++i) ++i)
{ {
EdgeID edgeID = const EdgeID edgeID =
facade->FindEdgeInEitherDirection(packed_v_t_path[i], packed_v_t_path[i + 1]); facade->FindEdgeInEitherDirection(packed_v_t_path[i], packed_v_t_path[i + 1]);
int length_of_current_edge = facade->GetEdgeData(edgeID).distance; int length_of_current_edge = facade->GetEdgeData(edgeID).distance;
if (length_of_current_edge + unpacked_until_distance >= T_threshold) if (length_of_current_edge + unpacked_until_distance >= T_threshold)

4
Server/RequestHandler.cpp
View File

@ -87,7 +87,7 @@ void RequestHandler::handle_request(const http::Request &req, http::Reply &reply
{ {
reply = http::Reply::StockReply(http::Reply::badRequest); reply = http::Reply::StockReply(http::Reply::badRequest);
reply.content.clear(); reply.content.clear();
const int position = std::distance(request.begin(), iter); const unsigned position = static_cast<unsigned>(std::distance(request.begin(), iter));
JSON::Object json_result; JSON::Object json_result;
json_result.values["status"] = 400; json_result.values["status"] = 400;
std::string message = "Query string malformed close to position "; std::string message = "Query string malformed close to position ";
@ -112,7 +112,7 @@ void RequestHandler::handle_request(const http::Request &req, http::Reply &reply
} }
// set headers // set headers
reply.headers.emplace_back("Content-Length", UintToString(reply.content.size())); reply.headers.emplace_back("Content-Length", UintToString(static_cast<unsigned>(reply.content.size())));
if ("gpx" == route_parameters.output_format) if ("gpx" == route_parameters.output_format)
{ // gpx file { // gpx file
reply.headers.emplace_back("Content-Type", "application/gpx+xml; charset=UTF-8"); reply.headers.emplace_back("Content-Type", "application/gpx+xml; charset=UTF-8");