Upgrade formatting to clang-format 10 (#5895)

* Update formatting tools to clang-format-10

* Reformat using clang-format-10.0.09

include/extractor/class_data.hpp

@@ -33,7 +33,7 @@ inline bool isValidClassName(const std::string &name)
                return std::isalnum(c);
            }) == name.end();
 }
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/compressed_edge_container.hpp

@@ -82,7 +82,7 @@ class CompressedEdgeContainer
     std::unordered_map<EdgeID, unsigned> m_reverse_edge_id_to_zipped_index_map;
     std::unique_ptr<SegmentDataContainer> segment_data;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // GEOMETRY_COMPRESSOR_HPP_

include/extractor/compressed_node_based_graph_edge.hpp

@@ -14,7 +14,7 @@ struct CompressedNodeBasedGraphEdge
     NodeID source;
     NodeID target;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // OSRM_EXTRACTOR_COMPRESSED_NODE_BASED_GRAPH_EDGE_HPP

include/extractor/datasources.hpp

@@ -42,7 +42,7 @@ class Datasources
     std::array<std::uint32_t, MAX_NUM_SOURES> lengths;
     std::array<char, MAX_LENGTH_NAME * MAX_NUM_SOURES> sources;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/edge_based_edge.hpp

@@ -96,7 +96,7 @@ inline bool EdgeBasedEdge::operator<(const EdgeBasedEdge &other) const
     return std::tie(source, target, data.weight, unidirectional) <
            std::tie(other.source, other.target, other.data.weight, other_is_unidirectional);
 }
-} // ns extractor
-} // ns osrm
+} // namespace extractor
+} // namespace osrm
 
 #endif /* EDGE_BASED_EDGE_HPP */

include/extractor/edge_based_graph_factory.hpp

@@ -54,7 +54,7 @@ struct TurnIndexBlock
 #pragma pack(pop)
 static_assert(std::is_trivial<TurnIndexBlock>::value, "TurnIndexBlock is not trivial");
 static_assert(sizeof(TurnIndexBlock) == 12, "TurnIndexBlock is not packed correctly");
-} // ns lookup
+} // namespace lookup
 
 struct NodeBasedGraphToEdgeBasedGraphMappingWriter; // fwd. decl
 

include/extractor/edge_based_node_segment.hpp

@@ -20,8 +20,9 @@ namespace extractor
 struct EdgeBasedNodeSegment
 {
     EdgeBasedNodeSegment()
-        : forward_segment_id{SPECIAL_SEGMENTID, false},
-          reverse_segment_id{SPECIAL_SEGMENTID, false}, u(SPECIAL_NODEID), v(SPECIAL_NODEID),
+        : forward_segment_id{SPECIAL_SEGMENTID, false}, reverse_segment_id{SPECIAL_SEGMENTID,
+                                                                           false},
+          u(SPECIAL_NODEID), v(SPECIAL_NODEID),
           fwd_segment_position(std::numeric_limits<unsigned short>::max() >>
                                1), // >> 1 because we've only got 15 bits
           is_startpoint(false)
@@ -47,7 +48,7 @@ struct EdgeBasedNodeSegment
     unsigned short fwd_segment_position : 15; // segment id in a compressed geometry
     bool is_startpoint : 1;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // OSRM_EXTRACT_EDGE_BASED_NODE_SEGMENT_HPP

include/extractor/extraction_containers.hpp

@@ -73,7 +73,7 @@ class ExtractionContainers
                      const std::string &osrm_path,
                      const std::string &names_data_path);
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* EXTRACTION_CONTAINERS_HPP */

include/extractor/extraction_helper_functions.hpp

@@ -82,7 +82,7 @@ template <typename Iterator> struct iso_8601_grammar : qi::grammar<Iterator, uns
     qi::uint_parser<unsigned, 10, 1, 2> uint_p;
     qi::uint_parser<unsigned, 10, 2, 2> uint2_p;
 };
-}
+} // namespace detail
 
 inline bool durationIsValid(const std::string &s)
 {
@@ -136,7 +136,7 @@ inline std::string canonicalizeStringList(std::string strlist, const std::string
     return strlist;
 }
 
-} // extractor
-} // osrm
+} // namespace extractor
+} // namespace osrm
 
 #endif // EXTRACTION_HELPER_FUNCTIONS_HPP

include/extractor/extraction_node.hpp

@@ -13,7 +13,7 @@ struct ExtractionNode
     bool traffic_lights;
     bool barrier;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // EXTRACTION_NODE_HPP

include/extractor/extraction_segment.hpp

@@ -26,7 +26,7 @@ struct ExtractionSegment
     double weight;
     double duration;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/extraction_turn.hpp

@@ -130,7 +130,7 @@ struct ExtractionTurn
     double weight;
     double duration;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/extraction_way.hpp

@@ -26,7 +26,7 @@ inline void maybeSetString(std::string &str, const char *value)
         str = std::string(value);
     }
 }
-}
+} // namespace detail
 
 /**
  * This struct is the direct result of the call to ```way_function```
@@ -130,7 +130,7 @@ struct ExtractionWay
     std::uint8_t highway_turn_classification : 4;
     std::uint8_t access_turn_classification : 4;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // EXTRACTION_WAY_HPP

include/extractor/extractor.hpp

@@ -115,7 +115,7 @@ class Extractor
         LaneDescriptionMap lane_description_map,
         ScriptingEnvironment &scripting_environment);
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* EXTRACTOR_HPP */

include/extractor/extractor_callbacks.hpp

@@ -16,15 +16,15 @@ namespace osmium
 class Node;
 class Way;
 class Relation;
-}
+} // namespace osmium
 
 namespace std
 {
 template <> struct hash<std::tuple<std::string, std::string, std::string, std::string, std::string>>
 {
     std::size_t operator()(
-        const std::tuple<std::string, std::string, std::string, std::string, std::string> &mk) const
-        noexcept
+        const std::tuple<std::string, std::string, std::string, std::string, std::string> &mk)
+        const noexcept
     {
         std::size_t seed = 0;
         boost::hash_combine(seed, std::get<0>(mk));
@@ -35,7 +35,7 @@ template <> struct hash<std::tuple<std::string, std::string, std::string, std::s
         return seed;
     }
 };
-}
+} // namespace std
 
 namespace osrm
 {
@@ -93,9 +93,9 @@ class ExtractorCallbacks
     void ProcessWay(const osmium::Way &current_way, const ExtractionWay &result_way);
 
     // warning: caller needs to take care of synchronization!
-    void ProcessManeuverOverride(const InputManeuverOverride & override);
+    void ProcessManeuverOverride(const InputManeuverOverride &override);
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* EXTRACTOR_CALLBACKS_HPP */

include/extractor/extractor_config.hpp

@@ -42,36 +42,35 @@ namespace extractor
 
 struct ExtractorConfig final : storage::IOConfig
 {
-    ExtractorConfig() noexcept : IOConfig(
-                                     {
-                                         "",
-                                     },
-                                     {},
-                                     {".osrm",
-                                      ".osrm.restrictions",
-                                      ".osrm.names",
-                                      ".osrm.tls",
-                                      ".osrm.tld",
-                                      ".osrm.geometry",
-                                      ".osrm.nbg_nodes",
-                                      ".osrm.ebg_nodes",
-                                      ".osrm.timestamp",
-                                      ".osrm.edges",
-                                      ".osrm.ebg",
-                                      ".osrm.ramIndex",
-                                      ".osrm.fileIndex",
-                                      ".osrm.turn_duration_penalties",
-                                      ".osrm.turn_weight_penalties",
-                                      ".osrm.turn_penalties_index",
-                                      ".osrm.enw",
-                                      ".osrm.properties",
-                                      ".osrm.icd",
-                                      ".osrm.cnbg",
-                                      ".osrm.cnbg_to_ebg",
-                                      ".osrm.maneuver_overrides"}),
-                                 requested_num_threads(0),
-                                 parse_conditionals(false),
-                                 use_locations_cache(true)
+    ExtractorConfig() noexcept
+        : IOConfig(
+              {
+                  "",
+              },
+              {},
+              {".osrm",
+               ".osrm.restrictions",
+               ".osrm.names",
+               ".osrm.tls",
+               ".osrm.tld",
+               ".osrm.geometry",
+               ".osrm.nbg_nodes",
+               ".osrm.ebg_nodes",
+               ".osrm.timestamp",
+               ".osrm.edges",
+               ".osrm.ebg",
+               ".osrm.ramIndex",
+               ".osrm.fileIndex",
+               ".osrm.turn_duration_penalties",
+               ".osrm.turn_weight_penalties",
+               ".osrm.turn_penalties_index",
+               ".osrm.enw",
+               ".osrm.properties",
+               ".osrm.icd",
+               ".osrm.cnbg",
+               ".osrm.cnbg_to_ebg",
+               ".osrm.maneuver_overrides"}),
+          requested_num_threads(0), parse_conditionals(false), use_locations_cache(true)
     {
     }
 
@@ -94,7 +93,7 @@ struct ExtractorConfig final : storage::IOConfig
     bool parse_conditionals;
     bool use_locations_cache;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // EXTRACTOR_CONFIG_HPP

include/extractor/files.hpp

@@ -586,8 +586,8 @@ void readCompressedNodeBasedGraph(const boost::filesystem::path &path, EdgeListT
 
     storage::serialization::read(reader, "/extractor/cnbg", edge_list);
 }
-}
-}
-}
+} // namespace files
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/first_and_last_segment_of_way.hpp

@@ -53,7 +53,7 @@ struct FirstAndLastSegmentOfWayCompare
     value_type max_value() { return FirstAndLastSegmentOfWay::max_value(); }
     value_type min_value() { return FirstAndLastSegmentOfWay::min_value(); }
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* FIRST_AND_LAST_SEGMENT_OF_WAY_HPP */

include/extractor/geojson_debug_policies.hpp

@@ -53,11 +53,11 @@ IntersectionPrinter<IntersectionType>::IntersectionPrinter(
 }
 
 template <typename IntersectionType>
-util::json::Array IntersectionPrinter<IntersectionType>::
-operator()(const NodeID intersection_node,
-           const IntersectionType &intersection,
-           const boost::optional<util::json::Object> &node_style,
-           const boost::optional<util::json::Object> &way_style) const
+util::json::Array IntersectionPrinter<IntersectionType>::operator()(
+    const NodeID intersection_node,
+    const IntersectionType &intersection,
+    const boost::optional<util::json::Object> &node_style,
+    const boost::optional<util::json::Object> &way_style) const
 {
     // request the number of lanes. This process needs to be in sync with what happens over at
     // intersection analysis

include/extractor/graph_compressor.hpp

@@ -39,7 +39,7 @@ class GraphCompressor
                          unsigned original_number_of_edges,
                          const util::NodeBasedDynamicGraph &graph) const;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/internal_extractor_edge.hpp

@@ -49,7 +49,7 @@ struct ByEdgeOrByMeterValue
     using value_type = float;
     value_type value;
 };
-}
+} // namespace detail
 
 struct InternalExtractorEdge
 {
@@ -86,7 +86,7 @@ struct InternalExtractorEdge
     // coordinate of the source node
     util::Coordinate source_coordinate;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // INTERNAL_EXTRACTOR_EDGE_HPP

include/extractor/intersection/intersection_analysis.hpp

@@ -79,8 +79,8 @@ IntersectionView getConnectedRoads(const util::NodeBasedDynamicGraph &graph,
 // for getConnectedRoads.
 IntersectionEdge skipDegreeTwoNodes(const util::NodeBasedDynamicGraph &graph,
                                     IntersectionEdge road);
-}
-}
-}
+} // namespace intersection
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/intersection/intersection_edge.hpp

@@ -42,8 +42,8 @@ struct IntersectionEdgeGeometry
 };
 
 using IntersectionEdgeGeometries = std::vector<IntersectionEdgeGeometry>;
-}
-}
-}
+} // namespace intersection
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/intersection_bearings_container.hpp

@@ -30,7 +30,7 @@ template <storage::Ownership Ownership>
 void write(storage::tar::FileWriter &writer,
            const std::string &name,
            const detail::IntersectionBearingsContainer<Ownership> &turn_data);
-}
+} // namespace serialization
 
 namespace detail
 {
@@ -99,12 +99,12 @@ template <storage::Ownership Ownership> class IntersectionBearingsContainer
     Vector<BearingClassID> node_to_class_id;
     RangeTable<16> class_id_to_ranges_table;
 };
-}
+} // namespace detail
 
 using IntersectionBearingsContainer =
     detail::IntersectionBearingsContainer<storage::Ownership::Container>;
 using IntersectionBearingsView = detail::IntersectionBearingsContainer<storage::Ownership::View>;
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/location_dependent_data.hpp

@@ -48,7 +48,7 @@ struct LocationDependentData
     std::vector<std::pair<polygon_bands_t, std::size_t>> polygons;
     std::vector<properties_t> properties;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/maneuver_override.hpp

@@ -71,19 +71,19 @@ struct UnresolvedManeuverOverride
     // check if all parts of the restriction reference an actual node
     bool Valid() const
     {
-        return !turn_sequence.empty() && std::none_of(turn_sequence.begin(),
-                                                      turn_sequence.end(),
-                                                      [](const auto &n) {
-                                                          return n.from == SPECIAL_NODEID ||
-                                                                 n.via == SPECIAL_NODEID ||
-                                                                 n.to == SPECIAL_NODEID;
-                                                      }) &&
+        return !turn_sequence.empty() &&
+               std::none_of(turn_sequence.begin(),
+                            turn_sequence.end(),
+                            [](const auto &n) {
+                                return n.from == SPECIAL_NODEID || n.via == SPECIAL_NODEID ||
+                                       n.to == SPECIAL_NODEID;
+                            }) &&
                (direction != guidance::DirectionModifier::MaxDirectionModifier ||
                 override_type != guidance::TurnType::Invalid);
     }
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 // custom specialization of std::hash can be injected in namespace std
 namespace std
@@ -104,7 +104,7 @@ template <> struct hash<osrm::extractor::NodeBasedTurn>
         return seed;
     }
 };
-}
+} // namespace std
 
 #endif
 /*

include/extractor/maneuver_override_relation_parser.hpp

@@ -59,7 +59,7 @@ class ManeuverOverrideRelationParser
     ManeuverOverrideRelationParser();
     boost::optional<InputManeuverOverride> TryParse(const osmium::Relation &relation) const;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* RESTRICTION_PARSER_HPP */

include/extractor/name_table.hpp

@@ -28,7 +28,7 @@ template <storage::Ownership Ownership>
 inline void write(storage::tar::FileWriter &writer,
                   const std::string &name,
                   const detail::NameTableImpl<Ownership> &index_data);
-}
+} // namespace serialization
 
 namespace detail
 {
@@ -111,7 +111,7 @@ template <storage::Ownership Ownership> class NameTableImpl
   private:
     IndexedData indexed_data;
 };
-}
+} // namespace detail
 
 using NameTable = detail::NameTableImpl<storage::Ownership::Container>;
 using NameTableView = detail::NameTableImpl<storage::Ownership::View>;

include/extractor/nbg_to_ebg.hpp

@@ -15,7 +15,7 @@ struct NBGToEBG
     NodeID u, v;
     NodeID forward_ebg_node, backward_ebg_node;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/node_based_edge.hpp

@@ -206,7 +206,7 @@ static_assert(sizeof(extractor::NodeBasedEdge) == 32,
               "bigger than expected. This will influence "
               "memory consumption.");
 
-} // ns extractor
-} // ns osrm
+} // namespace extractor
+} // namespace osrm
 
 #endif /* NODE_BASED_EDGE_HPP */

include/extractor/node_data_container.hpp

@@ -37,7 +37,7 @@ template <storage::Ownership Ownership>
 void write(storage::tar::FileWriter &writer,
            const std::string &name,
            const detail::EdgeBasedNodeDataContainerImpl<Ownership> &ebn_data);
-}
+} // namespace serialization
 
 namespace detail
 {
@@ -122,7 +122,7 @@ template <storage::Ownership Ownership> class EdgeBasedNodeDataContainerImpl
     Vector<EdgeBasedNode> nodes;
     Vector<NodeBasedEdgeAnnotation> annotation_data;
 };
-}
+} // namespace detail
 
 using EdgeBasedNodeDataExternalContainer =
     detail::EdgeBasedNodeDataContainerImpl<storage::Ownership::External>;

include/extractor/packed_osm_ids.hpp

@@ -16,7 +16,7 @@ using PackedOSMIDs = util::detail::PackedVector<OSMNodeID, 33, Ownership>;
 
 using PackedOSMIDsView = detail::PackedOSMIDs<storage::Ownership::View>;
 using PackedOSMIDs = detail::PackedOSMIDs<storage::Ownership::Container>;
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/profile_properties.hpp

@@ -138,7 +138,7 @@ struct ProfileProperties
     bool force_split_edges = false;
     bool call_tagless_node_function = true;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/query_node.hpp

@@ -48,7 +48,7 @@ struct QueryNode
                          MAX_OSM_NODEID);
     }
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // QUERY_NODE_HPP

include/extractor/restriction.hpp

@@ -250,7 +250,7 @@ struct ConditionalTurnRestriction : TurnRestriction
 {
     std::vector<util::OpeningHours> condition;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif // RESTRICTION_HPP

include/extractor/restriction_parser.hpp

@@ -54,7 +54,7 @@ class RestrictionParser
     bool parse_conditionals;
     std::vector<std::string> restrictions;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* RESTRICTION_PARSER_HPP */

include/extractor/road_classification.hpp

@@ -50,7 +50,7 @@ const constexpr Enum FOOT_PATH = 18;
 // a road simply offered for connectivity. Will be ignored in forks/other decisions. Always
 // considered non-obvious to continue on
 const constexpr Enum CONNECTIVITY = 31;
-} // namespace Road Class
+} // namespace RoadPriorityClass
 
 #pragma pack(push, 1)
 class RoadClassification

include/extractor/scripting_environment.hpp

@@ -18,7 +18,7 @@ namespace osmium
 class Node;
 class Way;
 class Relation;
-}
+} // namespace osmium
 
 namespace osrm
 {
@@ -73,7 +73,7 @@ class ScriptingEnvironment
 
     virtual bool HasLocationDependentData() const = 0;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* SCRIPTING_ENVIRONMENT_HPP */

include/extractor/scripting_environment_lua.hpp

@@ -110,7 +110,7 @@ class Sol2ScriptingEnvironment final : public ScriptingEnvironment
     tbb::enumerable_thread_specific<std::unique_ptr<LuaScriptingContext>> script_contexts;
     const LocationDependentData location_dependent_data;
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* SCRIPTING_ENVIRONMENT_LUA_HPP */

include/extractor/segment_data_container.hpp

@@ -39,7 +39,7 @@ template <storage::Ownership Ownership>
 inline void write(storage::tar::FileWriter &writer,
                   const std::string &name,
                   const detail::SegmentDataContainerImpl<Ownership> &segment_data);
-}
+} // namespace serialization
 
 namespace detail
 {
@@ -221,11 +221,11 @@ template <storage::Ownership Ownership> class SegmentDataContainerImpl
     SegmentDatasourceVector fwd_datasources;
     SegmentDatasourceVector rev_datasources;
 };
-}
+} // namespace detail
 
 using SegmentDataView = detail::SegmentDataContainerImpl<storage::Ownership::View>;
 using SegmentDataContainer = detail::SegmentDataContainerImpl<storage::Ownership::Container>;
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/serialization.hpp

@@ -222,8 +222,8 @@ inline void read(storage::tar::FileReader &reader,
     std::string buffer;
     util::serialization::read(reader, name, name_table.indexed_data);
 }
-}
-}
-}
+} // namespace serialization
+} // namespace extractor
+} // namespace osrm
 
 #endif

include/extractor/tarjan_scc.hpp

@@ -180,7 +180,7 @@ template <typename GraphT> class TarjanSCC
 
     unsigned GetComponentID(const NodeID node) const { return components_index[node]; }
 };
-}
-}
+} // namespace extractor
+} // namespace osrm
 
 #endif /* TARJAN_SCC_HPP */

include/extractor/travel_mode.hpp

@@ -103,7 +103,7 @@ inline std::string travelModeToString(const TravelMode mode)
     return token;
 }
 
-} // ns extractor
-} // ns osrm
+} // namespace extractor
+} // namespace osrm
 
 #endif /* TRAVEL_MODE_HPP */

include/extractor/turn_lane_types.hpp

@@ -52,7 +52,7 @@ const constexpr Mask uturn = 1u << 8u;
 const constexpr Mask merge_to_left = 1u << 9u;
 const constexpr Mask merge_to_right = 1u << 10u;
 
-} // TurnLaneType
+} // namespace TurnLaneType
 
 typedef std::vector<TurnLaneType::Mask> TurnLaneDescription;
 
@@ -100,7 +100,7 @@ inline TurnLanesIndexedArray transformTurnLaneMapIntoArrays(const LaneDescriptio
     return std::make_tuple(std::move(turn_lane_offsets), std::move(turn_lane_masks));
 }
 
-} // extractor
-} // osrm
+} // namespace extractor
+} // namespace osrm
 
 #endif /* OSRM_GUIDANCE_TURN_LANE_TYPES_HPP_ */