Apply clang-format again

include/extractor/guidance/road_classification.hpp

@@ -84,16 +84,10 @@ class RoadClassification
     bool IsLowPriorityRoadClass() const { return (0 != may_be_ignored); }
     void SetLowPriorityFlag(const bool new_value) { may_be_ignored = new_value; }
 
-    std::uint32_t GetPriority() const
-    {
-        return static_cast<std::uint32_t>(road_priority_class);
-    }
+    std::uint32_t GetPriority() const { return static_cast<std::uint32_t>(road_priority_class); }
 
     RoadPriorityClass::Enum GetClass() const { return road_priority_class; }
-    void SetClass(const RoadPriorityClass::Enum new_value)
-    {
-        road_priority_class = new_value;
-    }
+    void SetClass(const RoadPriorityClass::Enum new_value) { road_priority_class = new_value; }
 
     bool operator==(const RoadClassification &other) const
     {
@@ -102,10 +96,7 @@ class RoadClassification
                road_priority_class == other.road_priority_class;
     }
 
-    bool operator!=(const RoadClassification &other ) const
-    {
-        return !(*this == other);
-    }
+    bool operator!=(const RoadClassification &other) const { return !(*this == other); }
 
     std::string ToString() const
     {
@@ -116,7 +107,9 @@ class RoadClassification
 };
 #pragma pack(pop)
 
-static_assert(sizeof(RoadClassification) == 1,"Road Classification should fit a byte. Increasing this has a severe impact on memory.");
+static_assert(
+    sizeof(RoadClassification) == 1,
+    "Road Classification should fit a byte. Increasing this has a severe impact on memory.");
 
 inline bool canBeSeenAsFork(const RoadClassification first, const RoadClassification second)
 {

include/extractor/guidance/sliproad_handler.hpp

@@ -2,8 +2,8 @@
 #define OSRM_EXTRACTOR_GUIDANCE_SLIPROAD_HANDLER_HPP_
 
 #include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/name_table.hpp"
@@ -42,6 +42,7 @@ class SliproadHandler : public IntersectionHandler
     Intersection operator()(const NodeID nid,
                             const EdgeID via_eid,
                             Intersection intersection) const override final;
+
   private:
     const IntersectionGenerator &intersection_generator;
 };

include/extractor/guidance/turn_handler.hpp

@@ -61,7 +61,8 @@ class TurnHandler : public IntersectionHandler
     handleDistinctConflict(const EdgeID via_edge, ConnectedRoad &left, ConnectedRoad &right) const;
 
     // Classification
-    std::pair<std::size_t, std::size_t> findFork(const EdgeID via_edge, const Intersection &intersection) const;
+    std::pair<std::size_t, std::size_t> findFork(const EdgeID via_edge,
+                                                 const Intersection &intersection) const;
 
     Intersection assignLeftTurns(const EdgeID via_edge,
                                  Intersection intersection,

include/extractor/guidance/turn_lane_data.hpp

@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 
-#include "util/typedefs.hpp"
 #include "extractor/guidance/turn_lane_types.hpp"
+#include "util/typedefs.hpp"
 #include <string>
 #include <vector>
 

include/extractor/guidance/turn_lane_types.hpp

@@ -10,9 +10,9 @@
 #include <boost/assert.hpp>
 #include <boost/functional/hash_fwd.hpp>
 
+#include "util/json_container.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
-#include "util/json_container.hpp"
 
 namespace osrm
 {