remove redundant local variable

This commit is contained in:
Dennis Luxen
2014-10-28 10:39:29 -04:00
parent 8a5538356b
commit b227c90c18
14 changed files with 43 additions and 40 deletions
+2 -2
View File
@@ -45,12 +45,12 @@ class BasePlugin
virtual void HandleRequest(const RouteParameters &routeParameters, http::Reply &reply) = 0;
virtual bool check_all_coordinates(const std::vector<FixedPointCoordinate> coordinates) const final
{
if (2 > coordinates.size() ||
if (2 > coordinates.size() ||
std::any_of(std::begin(coordinates),
std::end(coordinates),
[](const FixedPointCoordinate &coordinate)
{
return !coordinate.isValid();
return !coordinate.is_valid();
}))
{
return false;
+2 -2
View File
@@ -81,7 +81,7 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
{
PhantomNode current_phantom_node;
ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], current_phantom_node);
if (current_phantom_node.isValid(facade->GetNumberOfNodes()))
if (current_phantom_node.is_valid(facade->GetNumberOfNodes()))
{
phantom_node_vector[i].emplace_back(std::move(current_phantom_node));
continue;
@@ -92,7 +92,7 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
route_parameters.zoom_level,
1);
BOOST_ASSERT(phantom_node_vector[i].front().isValid(facade->GetNumberOfNodes()));
BOOST_ASSERT(phantom_node_vector[i].front().is_valid(facade->GetNumberOfNodes()));
}
// TIMER_START(distance_table);
+1 -1
View File
@@ -44,7 +44,7 @@ template <class DataFacadeT> class LocatePlugin final : public BasePlugin
void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply) final
{
// check number of parameters
if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().isValid())
if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().is_valid())
{
reply = http::Reply::StockReply(http::Reply::badRequest);
return;
+2 -2
View File
@@ -49,7 +49,7 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply) final
{
// check number of parameters
if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().isValid())
if (route_parameters.coordinates.empty() || !route_parameters.coordinates.front().is_valid())
{
reply = http::Reply::StockReply(http::Reply::badRequest);
return;
@@ -62,7 +62,7 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
static_cast<int>(number_of_results));
JSON::Object json_result;
if (phantom_node_vector.empty() || !phantom_node_vector.front().isValid())
if (phantom_node_vector.empty() || !phantom_node_vector.front().is_valid())
{
json_result.values["status"] = 207;
}
+2 -2
View File
@@ -86,7 +86,7 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
!route_parameters.hints[i].empty())
{
ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], phantom_node_vector[i]);
if (phantom_node_vector[i].isValid(facade->GetNumberOfNodes()))
if (phantom_node_vector[i].is_valid(facade->GetNumberOfNodes()))
{
continue;
}
@@ -103,7 +103,7 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
};
osrm::for_each_pair(phantom_node_vector, build_phantom_pairs);
if (route_parameters.alternate_route &&
if (route_parameters.alternate_route &&
1 == raw_route.segment_end_coordinates.size())
{
search_engine_ptr->alternative_path(