From 58fbda0483c3982966339a5e9aa8cb3ee2969fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Mon, 23 Nov 2020 21:21:35 +0100 Subject: [PATCH 1/2] Avoid dereferencing iterators over empty indexed data values It seems the values can be empty even if size of blocks is non-zero (e.g. blocks.size()==1) --- include/util/indexed_data.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/util/indexed_data.hpp b/include/util/indexed_data.hpp index 8df3c350a..4c0bb297a 100644 --- a/include/util/indexed_data.hpp +++ b/include/util/indexed_data.hpp @@ -331,6 +331,9 @@ template struct Indexe // Return value at the given index ResultType at(std::uint32_t index) const { + if (values.empty()) + return ResultType(); + // Get block external ad internal indices const BlocksNumberType block_idx = index / (BLOCK_SIZE + 1); const std::uint32_t internal_idx = index % (BLOCK_SIZE + 1); From 50d9632ed7ce397b23663d392dc9728b076f1a16 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Thu, 26 Nov 2020 07:21:39 -0800 Subject: [PATCH 2/2] Upgrade formatting to clang-format 10 (#5895) * Update formatting tools to clang-format-10 * Reformat using clang-format-10.0.09 --- .travis.yml | 4 +- .../contractor/contract_excludable_graph.hpp | 4 +- .../contractor/contracted_edge_container.hpp | 4 +- include/contractor/contracted_metric.hpp | 6 +- include/contractor/contractor.hpp | 4 +- include/contractor/contractor_config.hpp | 4 +- include/contractor/crc32_processor.hpp | 4 +- include/contractor/files.hpp | 6 +- include/contractor/query_edge.hpp | 4 +- include/contractor/query_graph.hpp | 4 +- include/contractor/serialization.hpp | 6 +- include/customizer/cell_customizer.hpp | 9 ++- include/customizer/cell_metric.hpp | 6 +- include/customizer/customizer_config.hpp | 4 +- include/customizer/edge_based_graph.hpp | 6 +- include/customizer/files.hpp | 6 +- include/customizer/serialization.hpp | 6 +- include/engine/algorithm.hpp | 10 +-- include/engine/api/base_api.hpp | 6 +- include/engine/api/base_parameters.hpp | 6 +- include/engine/api/base_result.hpp | 6 +- include/engine/api/json_factory.hpp | 4 +- include/engine/api/match_api.hpp | 6 +- include/engine/api/match_parameters.hpp | 11 +-- include/engine/api/match_parameters_tidy.hpp | 8 +-- include/engine/api/nearest_api.hpp | 6 +- include/engine/api/nearest_parameters.hpp | 6 +- include/engine/api/route_api.hpp | 6 +- include/engine/api/route_parameters.hpp | 24 +++---- include/engine/api/table_api.hpp | 6 +- include/engine/api/table_parameters.hpp | 6 +- include/engine/api/tile_parameters.hpp | 6 +- include/engine/api/trip_api.hpp | 6 +- include/engine/api/trip_parameters.hpp | 10 +-- include/engine/approach.hpp | 2 +- include/engine/base64.hpp | 6 +- include/engine/bearing.hpp | 4 +- include/engine/data_watchdog.hpp | 6 +- include/engine/datafacade.hpp | 4 +- .../datafacade/algorithm_datafacade.hpp | 6 +- .../contiguous_internalmem_datafacade.hpp | 8 +-- include/engine/datafacade/datafacade_base.hpp | 6 +- include/engine/datafacade_factory.hpp | 4 +- include/engine/datafacade_provider.hpp | 6 +- include/engine/douglas_peucker.hpp | 6 +- include/engine/engine.hpp | 4 +- include/engine/engine_config.hpp | 4 +- include/engine/geospatial_query.hpp | 4 +- include/engine/guidance/assemble_geometry.hpp | 6 +- include/engine/guidance/assemble_leg.hpp | 2 +- include/engine/guidance/assemble_steps.hpp | 2 +- include/engine/guidance/collapse_turns.hpp | 2 +- include/engine/guidance/leg_geometry.hpp | 6 +- include/engine/guidance/route.hpp | 6 +- include/engine/guidance/route_leg.hpp | 6 +- include/engine/guidance/step_maneuver.hpp | 2 +- include/engine/hint.hpp | 4 +- include/engine/internal_route_result.hpp | 4 +- .../engine/map_matching/bayes_classifier.hpp | 6 +- .../map_matching/hidden_markov_model.hpp | 6 +- .../map_matching/matching_confidence.hpp | 6 +- include/engine/map_matching/sub_matching.hpp | 6 +- include/engine/phantom_node.hpp | 20 +++--- include/engine/plugins/match.hpp | 6 +- include/engine/plugins/nearest.hpp | 6 +- include/engine/plugins/plugin_base.hpp | 12 ++-- include/engine/plugins/table.hpp | 6 +- include/engine/plugins/tile.hpp | 6 +- include/engine/plugins/trip.hpp | 6 +- include/engine/plugins/viaroute.hpp | 6 +- include/engine/polyline_compressor.hpp | 6 +- include/engine/routing_algorithms.hpp | 4 +- .../routing_algorithms/routing_base_mld.hpp | 3 +- .../routing_algorithms/shortest_path_impl.hpp | 2 +- include/engine/search_engine_data.hpp | 4 +- include/engine/status.hpp | 4 +- .../engine/trip/trip_nearest_neighbour.hpp | 6 +- include/extractor/class_data.hpp | 4 +- .../extractor/compressed_edge_container.hpp | 4 +- .../compressed_node_based_graph_edge.hpp | 4 +- include/extractor/datasources.hpp | 4 +- include/extractor/edge_based_edge.hpp | 4 +- .../extractor/edge_based_graph_factory.hpp | 2 +- include/extractor/edge_based_node_segment.hpp | 9 +-- include/extractor/extraction_containers.hpp | 4 +- .../extractor/extraction_helper_functions.hpp | 6 +- include/extractor/extraction_node.hpp | 4 +- include/extractor/extraction_segment.hpp | 4 +- include/extractor/extraction_turn.hpp | 4 +- include/extractor/extraction_way.hpp | 6 +- include/extractor/extractor.hpp | 4 +- include/extractor/extractor_callbacks.hpp | 14 ++-- include/extractor/extractor_config.hpp | 63 ++++++++-------- include/extractor/files.hpp | 6 +- .../first_and_last_segment_of_way.hpp | 4 +- include/extractor/geojson_debug_policies.hpp | 10 +-- include/extractor/graph_compressor.hpp | 4 +- include/extractor/internal_extractor_edge.hpp | 6 +- .../intersection/intersection_analysis.hpp | 6 +- .../intersection/intersection_edge.hpp | 6 +- .../intersection_bearings_container.hpp | 8 +-- include/extractor/location_dependent_data.hpp | 4 +- include/extractor/maneuver_override.hpp | 20 +++--- .../maneuver_override_relation_parser.hpp | 4 +- include/extractor/name_table.hpp | 4 +- include/extractor/nbg_to_ebg.hpp | 4 +- include/extractor/node_based_edge.hpp | 4 +- include/extractor/node_data_container.hpp | 4 +- include/extractor/packed_osm_ids.hpp | 4 +- include/extractor/profile_properties.hpp | 4 +- include/extractor/query_node.hpp | 4 +- include/extractor/restriction.hpp | 4 +- include/extractor/restriction_parser.hpp | 4 +- include/extractor/road_classification.hpp | 2 +- include/extractor/scripting_environment.hpp | 6 +- .../extractor/scripting_environment_lua.hpp | 4 +- include/extractor/segment_data_container.hpp | 8 +-- include/extractor/serialization.hpp | 6 +- include/extractor/tarjan_scc.hpp | 4 +- include/extractor/travel_mode.hpp | 4 +- include/extractor/turn_lane_types.hpp | 6 +- include/guidance/files.hpp | 6 +- include/guidance/guidance_processing.hpp | 2 +- include/guidance/intersection_handler.hpp | 6 +- ...segregated_intersection_classification.hpp | 4 +- include/guidance/serialization.hpp | 6 +- include/guidance/turn_data_container.hpp | 8 +-- include/guidance/turn_instruction.hpp | 6 +- include/guidance/turn_lane_data.hpp | 2 +- include/guidance/turn_lane_handler.hpp | 3 +- include/nodejs/json_v8_renderer.hpp | 2 +- include/osrm/contractor.hpp | 4 +- include/osrm/coordinate.hpp | 2 +- include/osrm/customizer.hpp | 4 +- include/osrm/error_codes.hpp | 2 +- include/osrm/exception.hpp | 4 +- include/osrm/extractor.hpp | 4 +- include/osrm/osrm.hpp | 2 +- include/osrm/osrm_fwd.hpp | 10 +-- include/osrm/partitioner.hpp | 4 +- include/partitioner/bisection_graph.hpp | 5 +- .../partitioner/bisection_to_partition.hpp | 4 +- include/partitioner/cell_statistics.hpp | 4 +- include/partitioner/cell_storage.hpp | 27 ++++--- include/partitioner/edge_based_graph.hpp | 4 +- .../partitioner/edge_based_graph_reader.hpp | 36 +++++----- include/partitioner/files.hpp | 6 +- include/partitioner/multi_level_graph.hpp | 6 +- include/partitioner/multi_level_partition.hpp | 8 +-- include/partitioner/partitioner_config.hpp | 4 +- include/partitioner/remove_unconnected.hpp | 4 +- include/partitioner/reorder_first_last.hpp | 4 +- include/partitioner/serialization.hpp | 6 +- .../server/api/match_parameter_grammar.hpp | 8 +-- .../server/api/nearest_parameter_grammar.hpp | 8 +-- include/server/api/parameters_parser.hpp | 8 +-- include/server/api/parsed_url.hpp | 6 +- .../server/api/route_parameters_grammar.hpp | 8 +-- .../server/api/table_parameter_grammar.hpp | 8 +-- include/server/api/tile_parameter_grammar.hpp | 8 +-- include/server/api/trip_parameter_grammar.hpp | 8 +-- include/server/api/url_parser.hpp | 6 +- include/server/connection.hpp | 4 +- include/server/http/compression_type.hpp | 4 +- include/server/http/header.hpp | 6 +- include/server/http/reply.hpp | 6 +- include/server/http/request.hpp | 6 +- include/server/request_handler.hpp | 6 +- include/server/request_parser.hpp | 4 +- include/server/server.hpp | 4 +- include/server/service/base_service.hpp | 6 +- include/server/service/match_service.hpp | 6 +- include/server/service/nearest_service.hpp | 6 +- include/server/service/route_service.hpp | 6 +- include/server/service/table_service.hpp | 6 +- include/server/service/tile_service.hpp | 6 +- include/server/service/trip_service.hpp | 6 +- include/server/service/utils.hpp | 6 +- include/server/service_handler.hpp | 6 +- include/storage/block.hpp | 4 +- include/storage/io.hpp | 6 +- include/storage/io_config.hpp | 4 +- include/storage/io_fwd.hpp | 6 +- include/storage/serialization.hpp | 8 +-- include/storage/shared_data_index.hpp | 4 +- include/storage/shared_memory_ownership.hpp | 2 +- include/storage/storage.hpp | 4 +- include/storage/storage_config.hpp | 4 +- include/storage/tar.hpp | 11 +-- include/storage/tar_fwd.hpp | 6 +- include/storage/view_factory.hpp | 4 +- include/updater/csv_file_parser.hpp | 24 +++---- include/updater/csv_source.hpp | 6 +- include/updater/source.hpp | 4 +- include/updater/updater.hpp | 4 +- include/updater/updater_config.hpp | 4 +- include/util/alias.hpp | 4 +- include/util/bit_range.hpp | 6 +- include/util/cast.hpp | 6 +- include/util/concurrent_id_map.hpp | 4 +- include/util/conditional_restrictions.hpp | 4 +- include/util/connectivity_checksum.hpp | 4 +- include/util/container.hpp | 4 +- include/util/coordinate.hpp | 6 +- include/util/coordinate_calculation.hpp | 17 +++-- include/util/deallocating_vector.hpp | 8 ++- include/util/debug.hpp | 26 +++---- include/util/dist_table_wrapper.hpp | 4 +- include/util/dynamic_graph.hpp | 6 +- include/util/exception.hpp | 4 +- include/util/exclude_flag.hpp | 4 +- include/util/filtered_graph.hpp | 6 +- include/util/filtered_integer_range.hpp | 4 +- include/util/fingerprint.hpp | 4 +- include/util/for_each_range.hpp | 4 +- include/util/geojson_validation.hpp | 4 +- include/util/graph_traits.hpp | 6 +- include/util/graph_utils.hpp | 4 +- include/util/group_by.hpp | 4 +- include/util/guidance/bearing_class.hpp | 4 +- include/util/guidance/entry_class.hpp | 6 +- include/util/hilbert_value.hpp | 4 +- include/util/ieee754.hpp | 8 ++- include/util/indexed_data.hpp | 4 +- include/util/integer_range.hpp | 4 +- include/util/json_deep_compare.hpp | 10 +-- include/util/log.hpp | 4 +- include/util/lua_util.hpp | 7 +- include/util/matrix_graph_wrapper.hpp | 4 +- include/util/meminfo.hpp | 4 +- include/util/mmap_file.hpp | 6 +- include/util/mmap_tar.hpp | 4 +- include/util/msb.hpp | 4 +- include/util/node_based_graph.hpp | 4 +- include/util/opening_hours.hpp | 4 +- include/util/packed_vector.hpp | 8 +-- include/util/percent.hpp | 4 +- include/util/query_heap.hpp | 4 +- include/util/range_table.hpp | 6 +- include/util/rectangle.hpp | 4 +- include/util/serialization.hpp | 6 +- include/util/static_assert.hpp | 4 +- include/util/static_graph.hpp | 2 +- include/util/static_rtree.hpp | 17 ++--- include/util/std_hash.hpp | 2 +- include/util/string_util.hpp | 4 +- include/util/timed_histogram.hpp | 4 +- include/util/timezones.hpp | 4 +- include/util/timing_util.hpp | 4 +- include/util/to_osm_link.hpp | 4 +- include/util/trigonometry_table.hpp | 4 +- include/util/typedefs.hpp | 2 +- include/util/vector_tile.hpp | 6 +- include/util/vector_view.hpp | 4 +- include/util/viewport.hpp | 8 +-- include/util/web_mercator.hpp | 8 +-- include/util/xor_fast_hash.hpp | 4 +- include/util/xor_fast_hash_storage.hpp | 4 +- scripts/format.sh | 10 +-- src/benchmarks/alias.cpp | 2 +- src/benchmarks/match.cpp | 3 +- src/benchmarks/static_rtree.cpp | 4 +- src/contractor/contractor_search.cpp | 6 +- src/contractor/graph_contractor.cpp | 2 +- src/customize/customizer.cpp | 4 +- src/engine/douglas_peucker.cpp | 4 +- src/engine/engine_config.cpp | 4 +- src/engine/guidance/assemble_overview.cpp | 2 +- src/engine/guidance/assemble_steps.cpp | 8 +-- .../guidance/collapse_scenario_detection.cpp | 7 +- src/engine/guidance/post_processing.cpp | 5 +- src/engine/guidance/verbosity_reduction.cpp | 43 +++++------ src/engine/hint.cpp | 4 +- src/engine/plugins/match.cpp | 7 +- src/engine/plugins/nearest.cpp | 6 +- src/engine/plugins/table.cpp | 6 +- src/engine/plugins/tile.cpp | 9 ++- src/engine/plugins/trip.cpp | 11 +-- src/engine/plugins/viaroute.cpp | 6 +- src/engine/polyline_compressor.cpp | 6 +- .../alternative_path_ch.cpp | 4 +- .../routing_algorithms/many_to_many_mld.cpp | 5 +- .../routing_algorithms/map_matching.cpp | 2 +- src/engine/search_engine_data.cpp | 4 +- src/extractor/compressed_edge_container.cpp | 4 +- src/extractor/edge_based_graph_factory.cpp | 37 +++++----- src/extractor/extraction_containers.cpp | 13 ++-- src/extractor/extractor.cpp | 6 +- src/extractor/extractor_callbacks.cpp | 2 +- src/extractor/graph_compressor.cpp | 27 +++---- .../intersection/coordinate_extractor.cpp | 71 +++++++++---------- .../intersection/have_identical_names.cpp | 2 +- src/extractor/intersection/intersection.cpp | 4 +- .../intersection/intersection_analysis.cpp | 8 +-- .../intersection/mergable_road_detector.cpp | 4 +- .../intersection/node_based_graph_walker.cpp | 24 +++---- src/extractor/location_dependent_data.cpp | 5 +- .../maneuver_override_relation_parser.cpp | 4 +- src/extractor/raster_source.cpp | 4 +- src/extractor/restriction_parser.cpp | 4 +- src/extractor/scripting_environment_lua.cpp | 9 ++- src/guidance/driveway_handler.cpp | 5 +- src/guidance/guidance_processing.cpp | 2 - src/guidance/motorway_handler.cpp | 4 +- src/guidance/roundabout_handler.cpp | 9 ++- src/guidance/sliproad_handler.cpp | 6 +- src/guidance/suppress_mode_handler.cpp | 8 +-- src/guidance/turn_handler.cpp | 6 +- src/guidance/turn_lane_augmentation.cpp | 5 +- src/guidance/turn_lane_handler.cpp | 1 - src/guidance/turn_lane_matcher.cpp | 2 +- src/nodejs/node_osrm.cpp | 6 +- src/osrm/contractor.cpp | 2 +- src/osrm/customizer.cpp | 2 +- src/osrm/extractor.cpp | 2 +- src/osrm/osrm.cpp | 2 +- src/osrm/partitioner.cpp | 2 +- src/partitioner/bisection_to_partition.cpp | 6 +- src/partitioner/dinic_max_flow.cpp | 1 - src/partitioner/inertial_flow.cpp | 2 +- src/partitioner/renumber.cpp | 6 +- src/server/api/parameters_parser.cpp | 8 +-- src/server/api/url_parser.cpp | 8 +-- src/server/connection.cpp | 4 +- src/server/http/reply.cpp | 6 +- src/server/request_handler.cpp | 4 +- src/server/request_parser.cpp | 4 +- src/server/service/match_service.cpp | 8 +-- src/server/service/nearest_service.cpp | 8 +-- src/server/service/route_service.cpp | 8 +-- src/server/service/table_service.cpp | 8 +-- src/server/service/tile_service.cpp | 6 +- src/server/service/trip_service.cpp | 8 +-- src/server/service_handler.cpp | 4 +- src/storage/storage.cpp | 6 +- src/tools/components.cpp | 4 +- src/tools/contract.cpp | 3 +- src/tools/customize.cpp | 3 +- src/tools/extract.cpp | 3 +- src/tools/io-benchmark.cpp | 4 +- src/tools/partition.cpp | 3 +- src/tools/routed.cpp | 3 +- src/tools/store.cpp | 3 +- src/updater/csv_source.cpp | 6 +- src/updater/updater.cpp | 21 +++--- src/util/assert.cpp | 4 +- src/util/conditional_restrictions.cpp | 12 ++-- src/util/coordinate.cpp | 4 +- src/util/exception.cpp | 4 +- src/util/fingerprint.cpp | 4 +- src/util/geojson_debug_policies.cpp | 24 +++---- src/util/glibc_workaround.cpp | 2 +- src/util/log.cpp | 6 +- src/util/opening_hours.cpp | 8 +-- src/util/timed_historgram.cpp | 4 +- src/util/timezones.cpp | 4 +- .../contractor/contracted_edge_container.cpp | 4 +- unit_tests/contractor/helper.hpp | 4 +- unit_tests/engine/offline_facade.cpp | 14 ++-- .../extractor/intersection_analysis_tests.cpp | 8 +-- unit_tests/library/limits.cpp | 2 +- unit_tests/mocks/mock_datafacade.hpp | 4 +- .../partitioner/bisection_to_partition.cpp | 26 ++++++- unit_tests/partitioner/cell_storage.cpp | 2 +- unit_tests/partitioner/multi_level_graph.cpp | 2 +- unit_tests/partitioner/remove_unconnected.cpp | 2 +- unit_tests/partitioner/renumber.cpp | 2 +- unit_tests/server/parameters_io.hpp | 6 +- unit_tests/server/parameters_parser.cpp | 15 ++-- unit_tests/server/url_parser.cpp | 6 +- unit_tests/storage/serialization.cpp | 6 +- unit_tests/util/group_by.cpp | 2 +- unit_tests/util/serialization.cpp | 4 +- 373 files changed, 1198 insertions(+), 1163 deletions(-) mode change 100755 => 100644 include/storage/io.hpp diff --git a/.travis.yml b/.travis.yml index e1b1339e4..5b2df215e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,8 +62,8 @@ matrix: - npm ci --ignore-scripts script: - ./scripts/check_taginfo.py taginfo.json profiles/car.lua - - ${MASON} install clang-format 3.8.1 - - PATH=$(${MASON} prefix clang-format 3.8.1)/bin:${PATH} ./scripts/format.sh && ./scripts/error_on_dirty.sh + - ${MASON} install clang-format 10.0.0 + - PATH=$(${MASON} prefix clang-format 10.0.0)/bin:${PATH} ./scripts/format.sh && ./scripts/error_on_dirty.sh - node ./scripts/validate_changelog.js # See issue 4043 #- npm run docs && ./scripts/error_on_dirty.sh diff --git a/include/contractor/contract_excludable_graph.hpp b/include/contractor/contract_excludable_graph.hpp index 6ae29282a..74ea8373b 100644 --- a/include/contractor/contract_excludable_graph.hpp +++ b/include/contractor/contract_excludable_graph.hpp @@ -94,7 +94,7 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_, return GraphAndFilter{QueryGraph{num_nodes, std::move(edge_container.edges)}, edge_container.MakeEdgeFilters()}; } -} -} +} // namespace contractor +} // namespace osrm #endif diff --git a/include/contractor/contracted_edge_container.hpp b/include/contractor/contracted_edge_container.hpp index 8b37f5d4a..db3ae5cc9 100644 --- a/include/contractor/contracted_edge_container.hpp +++ b/include/contractor/contracted_edge_container.hpp @@ -164,7 +164,7 @@ struct ContractedEdgeContainer std::vector flags; std::vector edges; }; -} -} +} // namespace contractor +} // namespace osrm #endif diff --git a/include/contractor/contracted_metric.hpp b/include/contractor/contracted_metric.hpp index f44f49e83..c795a139a 100644 --- a/include/contractor/contracted_metric.hpp +++ b/include/contractor/contracted_metric.hpp @@ -15,11 +15,11 @@ template struct ContractedMetric detail::QueryGraph graph; std::vector> edge_filter; }; -} +} // namespace detail using ContractedMetric = detail::ContractedMetric; using ContractedMetricView = detail::ContractedMetric; -} -} +} // namespace contractor +} // namespace osrm #endif diff --git a/include/contractor/contractor.hpp b/include/contractor/contractor.hpp index ee1d2dd42..a0335d8ea 100644 --- a/include/contractor/contractor.hpp +++ b/include/contractor/contractor.hpp @@ -49,7 +49,7 @@ class Contractor private: ContractorConfig config; }; -} -} +} // namespace contractor +} // namespace osrm #endif // PROCESSING_CHAIN_HPP diff --git a/include/contractor/contractor_config.hpp b/include/contractor/contractor_config.hpp index 8f1455cce..c93d2e63d 100644 --- a/include/contractor/contractor_config.hpp +++ b/include/contractor/contractor_config.hpp @@ -73,7 +73,7 @@ struct ContractorConfig final : storage::IOConfig //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%) double core_factor; }; -} -} +} // namespace contractor +} // namespace osrm #endif // EXTRACTOR_OPTIONS_HPP diff --git a/include/contractor/crc32_processor.hpp b/include/contractor/crc32_processor.hpp index 4130ed583..a441ae576 100644 --- a/include/contractor/crc32_processor.hpp +++ b/include/contractor/crc32_processor.hpp @@ -125,7 +125,7 @@ struct RangebasedCRC32 private: IteratorbasedCRC32 crc32; }; -} -} +} // namespace contractor +} // namespace osrm #endif /* ITERATOR_BASED_CRC32_H */ diff --git a/include/contractor/files.hpp b/include/contractor/files.hpp index 8dcade795..39ffa5b54 100644 --- a/include/contractor/files.hpp +++ b/include/contractor/files.hpp @@ -52,8 +52,8 @@ inline void writeGraph(const boost::filesystem::path &path, serialization::write(writer, "/ch/metrics/" + pair.first, pair.second); } } -} -} -} +} // namespace files +} // namespace contractor +} // namespace osrm #endif diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp index 74d38e79e..351ecee24 100644 --- a/include/contractor/query_edge.hpp +++ b/include/contractor/query_edge.hpp @@ -77,7 +77,7 @@ struct QueryEdge data.distance == right.data.distance); } }; -} -} +} // namespace contractor +} // namespace osrm #endif // QUERYEDGE_HPP diff --git a/include/contractor/query_graph.hpp b/include/contractor/query_graph.hpp index e5758dcfe..b312a5403 100644 --- a/include/contractor/query_graph.hpp +++ b/include/contractor/query_graph.hpp @@ -19,7 +19,7 @@ using QueryGraph = util::StaticGraph; using QueryGraph = detail::QueryGraph; using QueryGraphView = detail::QueryGraph; -} -} +} // namespace contractor +} // namespace osrm #endif // QUERYEDGE_HPP diff --git a/include/contractor/serialization.hpp b/include/contractor/serialization.hpp index aa8659274..693216d6a 100644 --- a/include/contractor/serialization.hpp +++ b/include/contractor/serialization.hpp @@ -46,8 +46,8 @@ void read(storage::tar::FileReader &reader, metric.edge_filter[index]); } } -} -} -} +} // namespace serialization +} // namespace contractor +} // namespace osrm #endif diff --git a/include/customizer/cell_customizer.hpp b/include/customizer/cell_customizer.hpp index df5499579..9e27236d0 100644 --- a/include/customizer/cell_customizer.hpp +++ b/include/customizer/cell_customizer.hpp @@ -212,9 +212,8 @@ class CellCustomizer } const auto &data = graph.GetEdgeData(edge); - if (data.forward && - (first_level || - partition.GetCell(level - 1, node) != partition.GetCell(level - 1, to))) + if (data.forward && (first_level || partition.GetCell(level - 1, node) != + partition.GetCell(level - 1, to))) { const EdgeWeight to_weight = weight + data.weight; const EdgeDuration to_duration = duration + data.duration; @@ -237,7 +236,7 @@ class CellCustomizer const partitioner::MultiLevelPartition &partition; }; -} -} +} // namespace customizer +} // namespace osrm #endif // OSRM_CELLS_CUSTOMIZER_HPP diff --git a/include/customizer/cell_metric.hpp b/include/customizer/cell_metric.hpp index 7674174fe..a522facc3 100644 --- a/include/customizer/cell_metric.hpp +++ b/include/customizer/cell_metric.hpp @@ -22,11 +22,11 @@ template struct CellMetricImpl Vector durations; Vector distances; }; -} +} // namespace detail using CellMetric = detail::CellMetricImpl; using CellMetricView = detail::CellMetricImpl; -} -} +} // namespace customizer +} // namespace osrm #endif diff --git a/include/customizer/customizer_config.hpp b/include/customizer/customizer_config.hpp index 35ab1a356..4df629de5 100644 --- a/include/customizer/customizer_config.hpp +++ b/include/customizer/customizer_config.hpp @@ -39,7 +39,7 @@ struct CustomizationConfig final : storage::IOConfig updater::UpdaterConfig updater_config; }; -} -} +} // namespace customizer +} // namespace osrm #endif // OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP diff --git a/include/customizer/edge_based_graph.hpp b/include/customizer/edge_based_graph.hpp index 840a84299..5ef3277f9 100644 --- a/include/customizer/edge_based_graph.hpp +++ b/include/customizer/edge_based_graph.hpp @@ -34,7 +34,7 @@ template void write(storage::tar::FileWriter &writer, const std::string &name, const MultiLevelGraph &graph); -} +} // namespace serialization template class MultiLevelGraph : public partitioner::MultiLevelGraph @@ -126,7 +126,7 @@ using MultiLevelEdgeBasedGraph = MultiLevelGraph; using MultiLevelEdgeBasedGraphView = MultiLevelGraph; -} -} +} // namespace customizer +} // namespace osrm #endif diff --git a/include/customizer/files.hpp b/include/customizer/files.hpp index 364a2572d..335b77a30 100644 --- a/include/customizer/files.hpp +++ b/include/customizer/files.hpp @@ -106,8 +106,8 @@ inline void writeGraph(const boost::filesystem::path &path, writer.WriteFrom("/mld/connectivity_checksum", connectivity_checksum); serialization::write(writer, "/mld/multilevelgraph", graph); } -} -} -} +} // namespace files +} // namespace customizer +} // namespace osrm #endif diff --git a/include/customizer/serialization.hpp b/include/customizer/serialization.hpp index afe23cf9b..c242f8ba3 100644 --- a/include/customizer/serialization.hpp +++ b/include/customizer/serialization.hpp @@ -65,8 +65,8 @@ inline void write(storage::tar::FileWriter &writer, storage::serialization::write(writer, name + "/is_backward_edge", graph.is_backward_edge); storage::serialization::write(writer, name + "/node_to_edge_offset", graph.node_to_edge_offset); } -} -} -} +} // namespace serialization +} // namespace customizer +} // namespace osrm #endif diff --git a/include/engine/algorithm.hpp b/include/engine/algorithm.hpp index 760f78e80..1d65cac04 100644 --- a/include/engine/algorithm.hpp +++ b/include/engine/algorithm.hpp @@ -16,14 +16,14 @@ namespace ch struct Algorithm final { }; -} +} // namespace ch // Multi-Level Dijkstra namespace mld { struct Algorithm final { }; -} +} // namespace mld // Algorithm names template const char *name(); @@ -111,8 +111,8 @@ template <> struct HasGetTileTurns final : std::true_type template <> struct HasExcludeFlags final : std::true_type { }; -} -} -} +} // namespace routing_algorithms +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp index 702a7f15f..6cd1a6e48 100644 --- a/include/engine/api/base_api.hpp +++ b/include/engine/api/base_api.hpp @@ -128,8 +128,8 @@ class BaseAPI const BaseParameters ¶meters; }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/base_parameters.hpp b/include/engine/api/base_parameters.hpp index e7a49378d..ad071faec 100644 --- a/include/engine/api/base_parameters.hpp +++ b/include/engine/api/base_parameters.hpp @@ -124,8 +124,8 @@ struct BaseParameters }); } }; -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif // ROUTE_PARAMETERS_HPP diff --git a/include/engine/api/base_result.hpp b/include/engine/api/base_result.hpp index 65dd6aeeb..5dd63e7a9 100644 --- a/include/engine/api/base_result.hpp +++ b/include/engine/api/base_result.hpp @@ -16,8 +16,8 @@ namespace api { using ResultT = mapbox::util::variant; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp index 0ec505703..f92dba16a 100644 --- a/include/engine/api/json_factory.hpp +++ b/include/engine/api/json_factory.hpp @@ -112,8 +112,8 @@ util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps) util::json::Array makeRouteLegs(std::vector legs, std::vector step_geometries, std::vector annotations); -} -} +} // namespace json +} // namespace api } // namespace engine } // namespace osrm diff --git a/include/engine/api/match_api.hpp b/include/engine/api/match_api.hpp index e1639794e..a93e49710 100644 --- a/include/engine/api/match_api.hpp +++ b/include/engine/api/match_api.hpp @@ -248,8 +248,8 @@ class MatchAPI final : public RouteAPI const tidy::Result &tidy_result; }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/match_parameters.hpp b/include/engine/api/match_parameters.hpp index b54076582..73a660caf 100644 --- a/include/engine/api/match_parameters.hpp +++ b/include/engine/api/match_parameters.hpp @@ -79,8 +79,9 @@ struct MatchParameters : public RouteParameters bool tidy_, std::vector waypoints_, Args... args_) - : RouteParameters{std::forward(args_)..., waypoints_}, - timestamps{std::move(timestamps_)}, gaps(gaps_), tidy(tidy_) + : RouteParameters{std::forward(args_)..., waypoints_}, timestamps{std::move( + timestamps_)}, + gaps(gaps_), tidy(tidy_) { } @@ -94,8 +95,8 @@ struct MatchParameters : public RouteParameters (timestamps.empty() || timestamps.size() == coordinates.size()); } }; -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/match_parameters_tidy.hpp b/include/engine/api/match_parameters_tidy.hpp index ab4610c4f..198740afa 100644 --- a/include/engine/api/match_parameters_tidy.hpp +++ b/include/engine/api/match_parameters_tidy.hpp @@ -200,9 +200,9 @@ inline Result tidy(const MatchParameters ¶ms, Thresholds cfg = {15., 5}) return result; } -} // ns tidy -} // ns api -} // ns engine -} // ns osrm +} // namespace tidy +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/nearest_api.hpp b/include/engine/api/nearest_api.hpp index 4cc01e41f..aff3c57dc 100644 --- a/include/engine/api/nearest_api.hpp +++ b/include/engine/api/nearest_api.hpp @@ -159,8 +159,8 @@ class NearestAPI final : public BaseAPI } }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/nearest_parameters.hpp b/include/engine/api/nearest_parameters.hpp index f24251b8c..576e75352 100644 --- a/include/engine/api/nearest_parameters.hpp +++ b/include/engine/api/nearest_parameters.hpp @@ -52,8 +52,8 @@ struct NearestParameters : public BaseParameters bool IsValid() const { return BaseParameters::IsValid() && number_of_results >= 1; } }; -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif // ENGINE_API_NEAREST_PARAMETERS_HPP diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index 1c8283fae..4990d37c9 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -988,8 +988,8 @@ class RouteAPI : public BaseAPI } }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp index ba200050d..afda6c859 100644 --- a/include/engine/api/route_parameters.hpp +++ b/include/engine/api/route_parameters.hpp @@ -90,16 +90,10 @@ struct RouteParameters : public BaseParameters Args... args_) // Once we perfectly-forward `args` (see #2990) this constructor can delegate to the one // below. - : BaseParameters{std::forward(args_)...}, - steps{steps_}, - alternatives{alternatives_}, - number_of_alternatives{alternatives_ ? 1u : 0u}, - annotations{false}, - annotations_type{AnnotationsType::None}, - geometries{geometries_}, - overview{overview_}, - continue_straight{continue_straight_}, - waypoints() + : BaseParameters{std::forward(args_)...}, steps{steps_}, alternatives{alternatives_}, + number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{false}, + annotations_type{AnnotationsType::None}, geometries{geometries_}, overview{overview_}, + continue_straight{continue_straight_}, waypoints() { } @@ -151,8 +145,8 @@ struct RouteParameters : public BaseParameters : BaseParameters{std::forward(args_)...}, steps{steps_}, alternatives{alternatives_}, number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_}, annotations_type{annotations_ ? AnnotationsType::All : AnnotationsType::None}, - geometries{geometries_}, overview{overview_}, continue_straight{continue_straight_}, - waypoints{waypoints_} + geometries{geometries_}, overview{overview_}, + continue_straight{continue_straight_}, waypoints{waypoints_} { } @@ -217,8 +211,8 @@ inline RouteParameters::AnnotationsType operator|=(RouteParameters::AnnotationsT { return lhs = lhs | rhs; } -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp index d3efe15d9..72cdea4e6 100644 --- a/include/engine/api/table_api.hpp +++ b/include/engine/api/table_api.hpp @@ -407,8 +407,8 @@ class TableAPI final : public BaseAPI const TableParameters ¶meters; }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/table_parameters.hpp b/include/engine/api/table_parameters.hpp index fbbf6831e..a18b6808f 100644 --- a/include/engine/api/table_parameters.hpp +++ b/include/engine/api/table_parameters.hpp @@ -166,8 +166,8 @@ inline TableParameters::AnnotationsType &operator|=(TableParameters::Annotations { return lhs = lhs | rhs; } -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif // ENGINE_API_TABLE_PARAMETERS_HPP diff --git a/include/engine/api/tile_parameters.hpp b/include/engine/api/tile_parameters.hpp index 137c4dac3..e5328e7c7 100644 --- a/include/engine/api/tile_parameters.hpp +++ b/include/engine/api/tile_parameters.hpp @@ -70,8 +70,8 @@ struct TileParameters final return valid_x && valid_y && valid_z; } }; -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/trip_api.hpp b/include/engine/api/trip_api.hpp index 65f9381fc..90e5e1391 100644 --- a/include/engine/api/trip_api.hpp +++ b/include/engine/api/trip_api.hpp @@ -175,8 +175,8 @@ class TripAPI final : public RouteAPI const TripParameters ¶meters; }; -} // ns api -} // ns engine -} // ns osrm +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/api/trip_parameters.hpp b/include/engine/api/trip_parameters.hpp index 0df38d6c9..84d6b861a 100644 --- a/include/engine/api/trip_parameters.hpp +++ b/include/engine/api/trip_parameters.hpp @@ -65,8 +65,8 @@ struct TripParameters : public RouteParameters DestinationType destination_, bool roundtrip_, Args &&... args_) - : RouteParameters{std::forward(args_)...}, source{source_}, destination{destination_}, - roundtrip{roundtrip_} + : RouteParameters{std::forward(args_)...}, source{source_}, + destination{destination_}, roundtrip{roundtrip_} { } @@ -76,8 +76,8 @@ struct TripParameters : public RouteParameters bool IsValid() const { return RouteParameters::IsValid(); } }; -} -} -} +} // namespace api +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/approach.hpp b/include/engine/approach.hpp index 5c6787f27..f7d671a9c 100644 --- a/include/engine/approach.hpp +++ b/include/engine/approach.hpp @@ -42,5 +42,5 @@ enum class Approach : std::uint8_t }; } -} +} // namespace osrm #endif diff --git a/include/engine/base64.hpp b/include/engine/base64.hpp index 024d04b29..d1fa8753c 100644 --- a/include/engine/base64.hpp +++ b/include/engine/base64.hpp @@ -38,7 +38,7 @@ using BinaryFromBase64 = boost::archive::iterators::transform_width< 8, // get a view of 8 bit 6 // from a sequence of 6 bit >; -} // ns detail +} // namespace detail namespace engine { @@ -135,7 +135,7 @@ template T decodeBase64Bytewise(const std::string &encoded) return x; } -} // ns engine -} // ns osrm +} // namespace engine +} // namespace osrm #endif /* OSRM_BASE64_HPP */ diff --git a/include/engine/bearing.hpp b/include/engine/bearing.hpp index eaabae781..54e24f57f 100644 --- a/include/engine/bearing.hpp +++ b/include/engine/bearing.hpp @@ -46,7 +46,7 @@ inline bool operator==(const Bearing lhs, const Bearing rhs) return lhs.bearing == rhs.bearing && lhs.range == rhs.range; } inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); } -} -} +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/data_watchdog.hpp b/include/engine/data_watchdog.hpp index 416f1df76..29fb93443 100644 --- a/include/engine/data_watchdog.hpp +++ b/include/engine/data_watchdog.hpp @@ -142,14 +142,14 @@ class DataWatchdogImpl facade_factory; }; -} +} // namespace detail // This class monitors the shared memory region that contains the pointers to // the data and layout regions that should be used. This region is updated // once a new dataset arrives. template class FacadeT> using DataWatchdog = detail::DataWatchdogImpl>; -} -} +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/datafacade.hpp b/include/engine/datafacade.hpp index 76068a472..f0f8e9e5b 100644 --- a/include/engine/datafacade.hpp +++ b/include/engine/datafacade.hpp @@ -11,7 +11,7 @@ namespace engine using DataFacadeBase = datafacade::ContiguousInternalMemoryDataFacadeBase; template using DataFacade = datafacade::ContiguousInternalMemoryDataFacade; -} -} +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/datafacade/algorithm_datafacade.hpp b/include/engine/datafacade/algorithm_datafacade.hpp index a83a5340c..38030511c 100644 --- a/include/engine/datafacade/algorithm_datafacade.hpp +++ b/include/engine/datafacade/algorithm_datafacade.hpp @@ -99,8 +99,8 @@ template <> class AlgorithmDataFacade // searches for a specific edge virtual EdgeID FindEdge(const NodeID from, const NodeID to) const = 0; }; -} -} -} +} // namespace datafacade +} // namespace engine +} // namespace osrm #endif diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp index 63d4dbc3a..988678331 100644 --- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp +++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp @@ -609,7 +609,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade auto found_range = std::equal_range( m_maneuver_overrides.begin(), m_maneuver_overrides.end(), edge_based_node_id, Comp{}); - std::for_each(found_range.first, found_range.second, [&](const auto & override) { + std::for_each(found_range.first, found_range.second, [&](const auto &override) { std::vector sequence( m_maneuver_override_node_sequences.begin() + override.node_sequence_offset_begin, m_maneuver_override_node_sequences.begin() + override.node_sequence_offset_end); @@ -760,8 +760,8 @@ class ContiguousInternalMemoryDataFacade final { } }; -} -} -} +} // namespace datafacade +} // namespace engine +} // namespace osrm #endif // CONTIGUOUS_INTERNALMEM_DATAFACADE_HPP diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp index 77dab643f..b80c93b18 100644 --- a/include/engine/datafacade/datafacade_base.hpp +++ b/include/engine/datafacade/datafacade_base.hpp @@ -223,8 +223,8 @@ class BaseDataFacade virtual std::vector GetOverridesThatStartAt(const NodeID edge_based_node_id) const = 0; }; -} -} -} +} // namespace datafacade +} // namespace engine +} // namespace osrm #endif // DATAFACADE_BASE_HPP diff --git a/include/engine/datafacade_factory.hpp b/include/engine/datafacade_factory.hpp index a4ff57f38..676f32d2e 100644 --- a/include/engine/datafacade_factory.hpp +++ b/include/engine/datafacade_factory.hpp @@ -152,7 +152,7 @@ template