Remove usage of StringView typedef

include/util/guidance/name_announcements.hpp

@@ -27,8 +27,8 @@ namespace guidance
 // Name Change Logic
 // Used both during Extraction as well as during Post-Processing
 
-inline util::StringView longest_common_substring(const util::StringView &lhs,
-                                                 const util::StringView &rhs)
+inline std::string_view longest_common_substring(const std::string_view &lhs,
+                                                 const std::string_view &rhs)
 {
     if (lhs.empty() || rhs.empty())
         return "";
@@ -132,7 +132,7 @@ inline bool requiresNameAnnounced(const StringView &from_name,
         boost::starts_with(from_name, to_name) || boost::starts_with(to_name, from_name);
 
     const auto checkForPrefixOrSuffixChange =
-        [](const StringView &first, const StringView &second, const SuffixTable &suffix_table) {
+        [](const std::string_view &first, const std::string_view &second, const SuffixTable &suffix_table) {
             std::string first_prefix, first_suffix, second_prefix, second_suffix;
             std::tie(first_prefix, first_suffix, second_prefix, second_suffix) =
                 decompose(first, second);
@@ -203,17 +203,17 @@ inline bool requiresNameAnnounced(const std::string &from_name,
     struct NopSuffixTable final
     {
         NopSuffixTable() {}
-        bool isSuffix(const StringView &) const { return false; }
+        bool isSuffix(const std::string_view &) const { return false; }
     } static const table;
 
-    return requiresNameAnnounced(util::StringView(from_name),
-                                 util::StringView(from_ref),
-                                 util::StringView(from_pronunciation),
-                                 util::StringView(from_exits),
-                                 util::StringView(to_name),
-                                 util::StringView(to_ref),
-                                 util::StringView(to_pronunciation),
-                                 util::StringView(to_exits),
+    return requiresNameAnnounced(std::string_view(from_name),
+                                 std::string_view(from_ref),
+                                 std::string_view(from_pronunciation),
+                                 std::string_view(from_exits),
+                                 std::string_view(to_name),
+                                 std::string_view(to_ref),
+                                 std::string_view(to_pronunciation),
+                                 std::string_view(to_exits),
                                  table);
 }
 

include/util/indexed_data.hpp

@@ -365,14 +365,14 @@ template <typename GroupBlockPolicy, storage::Ownership Ownership> struct Indexe
         std::enable_if_t<std::is_same<T, typename std::iterator_traits<Iter>::value_type>::value>;
 
     template <typename T = ResultType, typename Iter, typename = IsValueIterator<Iter, ValueType>>
-    typename std::enable_if<!std::is_same<T, StringView>::value, T>::type
+    typename std::enable_if<!std::is_same<T, std::string_view>::value, T>::type
     adapt(const Iter first, const Iter last) const
     {
         return ResultType(first, last);
     }
 
     template <typename T = ResultType, typename Iter, typename = IsValueIterator<Iter, ValueType>>
-    typename std::enable_if<std::is_same<T, StringView>::value, T>::type
+    typename std::enable_if<std::is_same<T, std::string_view>::value, T>::type
     adapt(const Iter first, const Iter last) const
     {
         auto diff = std::distance(first, last);

include/util/string_view.hpp

@@ -9,7 +9,7 @@ namespace osrm
 namespace util
 {
 // Convenience typedef: boost::string_ref, boost::string_view or C++17's string_view
-using StringView = std::string_view;
+// using StringView = std::string_view;
 
 } // namespace util
 } // namespace osrm