From 8eccfaa034a8234e004612ddfb509c765b1e03ca Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 17 Oct 2014 14:19:33 +0200 Subject: [PATCH] fix a number of implicit conversions --- DataStructures/DynamicGraph.h | 4 ++-- DataStructures/NodeBasedGraph.h | 2 +- Plugins/NearestPlugin.h | 7 ++++--- Util/simple_logger.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/DataStructures/DynamicGraph.h b/DataStructures/DynamicGraph.h index bc0c8e0cd..81b1afe11 100644 --- a/DataStructures/DynamicGraph.h +++ b/DataStructures/DynamicGraph.h @@ -71,7 +71,7 @@ template class DynamicGraph }; // Constructs an empty graph with a given number of nodes. - explicit DynamicGraph(int32_t nodes) : number_of_nodes(nodes), number_of_edges(0) + explicit DynamicGraph(NodeIterator nodes) : number_of_nodes(nodes), number_of_edges(0) { node_list.reserve(number_of_nodes); node_list.resize(number_of_nodes); @@ -80,7 +80,7 @@ template class DynamicGraph edge_list.resize(number_of_nodes); } - template DynamicGraph(const int32_t nodes, const ContainerT &graph) + template DynamicGraph(const NodeIterator nodes, const ContainerT &graph) { number_of_nodes = nodes; number_of_edges = (EdgeIterator)graph.size(); diff --git a/DataStructures/NodeBasedGraph.h b/DataStructures/NodeBasedGraph.h index a8c0a7a75..cceb4a078 100644 --- a/DataStructures/NodeBasedGraph.h +++ b/DataStructures/NodeBasedGraph.h @@ -164,7 +164,7 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector(number_of_nodes, edges_list); + auto graph = std::make_shared(static_cast(number_of_nodes), edges_list); return graph; } diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index e71f940fc..e4fec91c1 100644 --- a/Plugins/NearestPlugin.h +++ b/Plugins/NearestPlugin.h @@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BasePlugin.h" #include "../DataStructures/JSONContainer.h" #include "../DataStructures/PhantomNodes.h" +#include "../DataStructures/Range.h" #include @@ -53,12 +54,12 @@ template class NearestPlugin final : public BasePlugin reply = http::Reply::StockReply(http::Reply::badRequest); return; } - int number_of_results = static_cast(route_parameters.num_results); + auto number_of_results = static_cast(route_parameters.num_results); std::vector phantom_node_vector; facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates.front(), phantom_node_vector, route_parameters.zoom_level, - number_of_results); + static_cast(number_of_results)); JSON::Object json_result; if (phantom_node_vector.empty() || !phantom_node_vector.front().isValid()) @@ -74,7 +75,7 @@ template class NearestPlugin final : public BasePlugin { JSON::Array results; - int vector_length = phantom_node_vector.size(); + auto vector_length = phantom_node_vector.size(); for (const auto i : osrm::irange(0, std::min(number_of_results, vector_length))) { JSON::Array json_coordinate; diff --git a/Util/simple_logger.cpp b/Util/simple_logger.cpp index 1ea7ea66f..5442f54c1 100644 --- a/Util/simple_logger.cpp +++ b/Util/simple_logger.cpp @@ -114,7 +114,7 @@ SimpleLogger::~SimpleLogger() std::lock_guard lock(get_mutex()); if (!LogPolicy::GetInstance().IsMute()) { - const bool is_terminal = isatty(fileno(stdout)); + const bool is_terminal = static_cast(isatty(fileno(stdout))); switch (level) { case logWARNING: