From 552cdbfe208e75eabc23bc78fbdf3fd197a7d264 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sun, 3 Jan 2016 18:55:42 +0100 Subject: [PATCH] Apply clang-tidy --- include/util/routed_options.hpp | 2 +- src/benchmarks/static_rtree.cpp | 2 +- src/contractor/contractor_options.cpp | 2 +- src/engine/osrm_impl.cpp | 2 +- src/engine/phantom_node.cpp | 4 +--- src/engine/route_parameters.cpp | 2 +- src/extractor/extraction_containers.cpp | 2 +- src/extractor/extractor.cpp | 4 ++-- src/extractor/extractor_options.cpp | 2 +- src/extractor/graph_compressor.cpp | 2 +- src/extractor/restriction_map.cpp | 6 +----- src/extractor/restriction_parser.cpp | 10 +++------- src/tools/contract.cpp | 2 +- src/tools/datastore.cpp | 8 ++++---- src/tools/routed.cpp | 4 ++-- src/util/coordinate.cpp | 8 ++------ 16 files changed, 24 insertions(+), 38 deletions(-) diff --git a/include/util/routed_options.hpp b/include/util/routed_options.hpp index 12d1e8d8a..29840b5e7 100644 --- a/include/util/routed_options.hpp +++ b/include/util/routed_options.hpp @@ -2,7 +2,7 @@ #define ROUTED_OPTIONS_HPP #include "util/version.hpp" -#include "util/ini_file.hpp" +#include "util/version.hpp" #include "util/osrm_exception.hpp" #include "util/simple_logger.hpp" diff --git a/src/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp index e8c5a81f2..c3967f4cd 100644 --- a/src/benchmarks/static_rtree.cpp +++ b/src/benchmarks/static_rtree.cpp @@ -6,8 +6,8 @@ #include "osrm/coordinate.hpp" -#include #include +#include // Choosen by a fair W20 dice roll (this value is completely arbitrary) constexpr unsigned RANDOM_SEED = 13; diff --git a/src/contractor/contractor_options.cpp b/src/contractor/contractor_options.cpp index 2bb8451d8..463bd7906 100644 --- a/src/contractor/contractor_options.cpp +++ b/src/contractor/contractor_options.cpp @@ -1,7 +1,7 @@ #include "contractor/contractor_options.hpp" -#include "util/version.hpp" #include "util/simple_logger.hpp" +#include "util/version.hpp" #include #include diff --git a/src/engine/osrm_impl.cpp b/src/engine/osrm_impl.cpp index 84faf89da..f9a486e75 100644 --- a/src/engine/osrm_impl.cpp +++ b/src/engine/osrm_impl.cpp @@ -27,9 +27,9 @@ class named_mutex; #include #include -#include "osrm/route_parameters.hpp" #include "osrm/libosrm_config.hpp" #include "osrm/osrm.hpp" +#include "osrm/route_parameters.hpp" #include #include diff --git a/src/engine/phantom_node.cpp b/src/engine/phantom_node.cpp index 8c4a17a7a..689fc5ebd 100644 --- a/src/engine/phantom_node.cpp +++ b/src/engine/phantom_node.cpp @@ -1,8 +1,6 @@ #include "engine/phantom_node.hpp" - -#include "util/typedefs.hpp" #include "extractor/travel_mode.hpp" - +#include "util/typedefs.hpp" #include "osrm/coordinate.hpp" #include diff --git a/src/engine/route_parameters.cpp b/src/engine/route_parameters.cpp index 6649462bf..d98d963ea 100644 --- a/src/engine/route_parameters.cpp +++ b/src/engine/route_parameters.cpp @@ -50,7 +50,7 @@ void RouteParameters::setAllUTurns(const bool flag) } } -void RouteParameters::setDeprecatedAPIFlag(const std::string &) { deprecatedAPI = true; } +void RouteParameters::setDeprecatedAPIFlag(const std::string & /*unused*/) { deprecatedAPI = true; } void RouteParameters::setChecksum(const unsigned sum) { check_sum = sum; } diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index d21d61d49..18de02d32 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include #include diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index f04c4564a..496c8639e 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -18,8 +18,8 @@ #include "util/static_graph.hpp" #include "util/static_rtree.hpp" -#include "extractor/restriction_map.hpp" #include "extractor/compressed_edge_container.hpp" +#include "extractor/restriction_map.hpp" #include "extractor/tarjan_scc.hpp" #include "contractor/crc32_processor.hpp" @@ -573,7 +573,7 @@ void extractor::BuildRTree(std::vector node_based_edge_list, node_based_edge_list.resize(new_size); TIMER_START(construction); - StaticRTree(node_based_edge_list, config.rtree_nodes_output_path, + StaticRTree rtree(node_based_edge_list, config.rtree_nodes_output_path, config.rtree_leafs_output_path, internal_to_external_node_map); TIMER_STOP(construction); diff --git a/src/extractor/extractor_options.cpp b/src/extractor/extractor_options.cpp index 0c3d5211a..685704a57 100644 --- a/src/extractor/extractor_options.cpp +++ b/src/extractor/extractor_options.cpp @@ -1,7 +1,7 @@ #include "extractor/extractor_options.hpp" -#include "util/version.hpp" #include "util/ini_file.hpp" +#include "util/version.hpp" #include "util/simple_logger.hpp" #include diff --git a/src/extractor/graph_compressor.cpp b/src/extractor/graph_compressor.cpp index c9e1d5b76..8ee098089 100644 --- a/src/extractor/graph_compressor.cpp +++ b/src/extractor/graph_compressor.cpp @@ -1,9 +1,9 @@ #include "extractor/graph_compressor.hpp" #include "extractor/compressed_edge_container.hpp" +#include "extractor/restriction_map.hpp" #include "util/dynamic_graph.hpp" #include "util/node_based_graph.hpp" -#include "extractor/restriction_map.hpp" #include "util/percent.hpp" #include "util/simple_logger.hpp" diff --git a/src/extractor/restriction_map.cpp b/src/extractor/restriction_map.cpp index 44a6b574c..c104d19d8 100644 --- a/src/extractor/restriction_map.cpp +++ b/src/extractor/restriction_map.cpp @@ -149,9 +149,5 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u, // check of node is the start of any restriction bool RestrictionMap::IsSourceNode(const NodeID node) const { - if (m_restriction_start_nodes.find(node) == m_restriction_start_nodes.end()) - { - return false; - } - return true; + return m_restriction_start_nodes.find(node) != m_restriction_start_nodes.end(); } diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp index 5a5137b64..85f93dce4 100644 --- a/src/extractor/restriction_parser.cpp +++ b/src/extractor/restriction_parser.cpp @@ -9,9 +9,9 @@ #include #include #include +#include #include #include -#include #include #include @@ -218,12 +218,8 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st return std::any_of(std::begin(exceptions), std::end(exceptions), [&](const std::string ¤t_string) { - if (std::end(restriction_exceptions) != + return std::end(restriction_exceptions) != std::find(std::begin(restriction_exceptions), - std::end(restriction_exceptions), current_string)) - { - return true; - } - return false; + std::end(restriction_exceptions), current_string); }); } diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp index 899f1e8f8..f5f994bcb 100644 --- a/src/tools/contract.cpp +++ b/src/tools/contract.cpp @@ -8,8 +8,8 @@ #include #include -#include #include +#include int main(int argc, char *argv[]) try { diff --git a/src/tools/datastore.cpp b/src/tools/datastore.cpp index d0ea9a72a..262e095ce 100644 --- a/src/tools/datastore.cpp +++ b/src/tools/datastore.cpp @@ -6,15 +6,15 @@ #include "util/shared_memory_vector_wrapper.hpp" #include "util/static_graph.hpp" #include "util/static_rtree.hpp" +#include "engine/datafacade/datafacade_base.hpp" #include "extractor/travel_mode.hpp" #include "extractor/turn_instructions.hpp" -#include "engine/datafacade/datafacade_base.hpp" #include "engine/datafacade/shared_datatype.hpp" #include "engine/datafacade/shared_barriers.hpp" #include "util/datastore_options.hpp" -#include "util/simple_logger.hpp" -#include "util/osrm_exception.hpp" #include "util/fingerprint.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include "util/typedefs.hpp" #include "osrm/coordinate.hpp" @@ -33,8 +33,8 @@ using QueryGraph = StaticGraph; #include #include -#include #include +#include // delete a shared memory region. report warning if it could not be deleted void delete_region(const SharedDataType region) diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp index f14052df6..c95233c81 100644 --- a/src/tools/routed.cpp +++ b/src/tools/routed.cpp @@ -1,5 +1,5 @@ #include "server/server.hpp" -#include "util/version.hpp" +#include "util/ini_file.hpp" #include "util/routed_options.hpp" #include "util/simple_logger.hpp" @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include #ifdef _WIN32 boost::function0 console_ctrl_function; diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp index 5075d0670..f5799cb08 100644 --- a/src/util/coordinate.cpp +++ b/src/util/coordinate.cpp @@ -36,12 +36,8 @@ FixedPointCoordinate::FixedPointCoordinate(int lat, int lon) : lat(lat), lon(lon bool FixedPointCoordinate::is_valid() const { - if (lat > 90 * COORDINATE_PRECISION || lat < -90 * COORDINATE_PRECISION || - lon > 180 * COORDINATE_PRECISION || lon < -180 * COORDINATE_PRECISION) - { - return false; - } - return true; + return !(lat > 90 * COORDINATE_PRECISION || lat < -90 * COORDINATE_PRECISION || + lon > 180 * COORDINATE_PRECISION || lon < -180 * COORDINATE_PRECISION); } bool FixedPointCoordinate::operator==(const FixedPointCoordinate &other) const