From 8412716ce49fb27092efb7eb2a4653e278d2c3be Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 23 May 2024 10:19:40 +0200 Subject: [PATCH] Fix formatting --- include/extractor/extractor_callbacks.hpp | 2 +- include/extractor/traffic_signals.hpp | 2 +- include/util/guidance/bearing_class.hpp | 3 ++- include/util/guidance/turn_lanes.hpp | 15 ++++++++------- include/util/std_hash.hpp | 9 ++++----- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp index 3f066663b..83672f549 100644 --- a/include/extractor/extractor_callbacks.hpp +++ b/include/extractor/extractor_callbacks.hpp @@ -3,8 +3,8 @@ #include "extractor/class_data.hpp" #include "extractor/turn_lane_types.hpp" -#include "util/typedefs.hpp" #include "util/std_hash.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/include/extractor/traffic_signals.hpp b/include/extractor/traffic_signals.hpp index 4e79554e4..febb5d25d 100644 --- a/include/extractor/traffic_signals.hpp +++ b/include/extractor/traffic_signals.hpp @@ -1,8 +1,8 @@ #ifndef OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP #define OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP -#include "util/typedefs.hpp" #include "util/std_hash.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/include/util/guidance/bearing_class.hpp b/include/util/guidance/bearing_class.hpp index c6f57412a..1e5fce1eb 100644 --- a/include/util/guidance/bearing_class.hpp +++ b/include/util/guidance/bearing_class.hpp @@ -62,7 +62,8 @@ inline size_t hash<::osrm::util::guidance::BearingClass>::operator()( const ::osrm::util::guidance::BearingClass &bearing_class) const { std::size_t value = 0; - hash_range(value, bearing_class.available_bearings.cbegin(), bearing_class.available_bearings.cend()); + hash_range( + value, bearing_class.available_bearings.cbegin(), bearing_class.available_bearings.cend()); return value; } } // namespace std diff --git a/include/util/guidance/turn_lanes.hpp b/include/util/guidance/turn_lanes.hpp index 1e2476cce..21126ee16 100644 --- a/include/util/guidance/turn_lanes.hpp +++ b/include/util/guidance/turn_lanes.hpp @@ -17,7 +17,6 @@ class LaneTuple; class LaneTupleIdPair; } // namespace osrm::util::guidance - namespace osrm::util::guidance { @@ -63,10 +62,12 @@ using LaneDataIdMap = ConcurrentIDMap; } // namespace osrm::util::guidance -namespace std { - template <> struct hash<::osrm::util::guidance::LaneTuple> +namespace std { - inline std::size_t operator()(const ::osrm::util::guidance::LaneTuple &lane_tuple) const { +template <> struct hash<::osrm::util::guidance::LaneTuple> +{ + inline std::size_t operator()(const ::osrm::util::guidance::LaneTuple &lane_tuple) const + { std::size_t seed{0}; hash_combine(seed, lane_tuple.lanes_in_turn); hash_combine(seed, lane_tuple.first_lane_from_the_right); @@ -77,8 +78,9 @@ namespace std { template <> struct hash<::osrm::util::guidance::LaneTupleIdPair> { inline std::size_t - operator()(const ::osrm::util::guidance::LaneTupleIdPair &lane_tuple_id_pair) const { - std::size_t seed{0}; + operator()(const ::osrm::util::guidance::LaneTupleIdPair &lane_tuple_id_pair) const + { + std::size_t seed{0}; hash_combine(seed, lane_tuple_id_pair.first); hash_combine(seed, lane_tuple_id_pair.second); return seed; @@ -86,5 +88,4 @@ template <> struct hash<::osrm::util::guidance::LaneTupleIdPair> }; } // namespace std - #endif /* OSRM_UTIL_GUIDANCE_TURN_LANES_HPP */ diff --git a/include/util/std_hash.hpp b/include/util/std_hash.hpp index c610706d5..4f64f940d 100644 --- a/include/util/std_hash.hpp +++ b/include/util/std_hash.hpp @@ -15,9 +15,9 @@ template void hash_combine(std::size_t &seed, const T &val) seed ^= std::hash()(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2); } -template void hash_range(std::size_t& seed, It first, const It last) +template void hash_range(std::size_t &seed, It first, const It last) { - for(; first != last; ++first) + for (; first != last; ++first) { hash_combine(seed, *first); } @@ -41,10 +41,9 @@ template std::size_t hash_val(const Types &...args) namespace std { -template -struct hash> +template struct hash> { - template + template static auto apply_tuple(const std::tuple &t, std::index_sequence) { std::size_t seed = 0;