diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp index 7e9e69c88..8ecd5946e 100644 --- a/include/engine/datafacade/datafacade_base.hpp +++ b/include/engine/datafacade/datafacade_base.hpp @@ -26,7 +26,6 @@ #include "util/integer_range.hpp" #include "util/packed_vector.hpp" #include "util/string_util.hpp" -#include "util/string_view.hpp" #include "util/typedefs.hpp" #include "osrm/coordinate.hpp" @@ -37,6 +36,7 @@ #include #include +#include #include #include diff --git a/include/extractor/datasources.hpp b/include/extractor/datasources.hpp index 844ceae0f..ea53fc3e4 100644 --- a/include/extractor/datasources.hpp +++ b/include/extractor/datasources.hpp @@ -1,9 +1,10 @@ #ifndef OSRM_EXTRACT_DATASOURCES_HPP #define OSRM_EXTRACT_DATASOURCES_HPP +#include "util/typedefs.hpp" + #include -#include -#include +#include namespace osrm { diff --git a/include/extractor/name_table.hpp b/include/extractor/name_table.hpp index 35e966ee1..44cc06f89 100644 --- a/include/extractor/name_table.hpp +++ b/include/extractor/name_table.hpp @@ -2,10 +2,10 @@ #define OSRM_EXTRACTOR_NAME_TABLE_HPP #include "util/indexed_data.hpp" -#include "util/string_view.hpp" #include "util/typedefs.hpp" #include +#include namespace osrm { diff --git a/include/extractor/suffix_table.hpp b/include/extractor/suffix_table.hpp index 52dc4eec4..cadfb5e2e 100644 --- a/include/extractor/suffix_table.hpp +++ b/include/extractor/suffix_table.hpp @@ -2,9 +2,9 @@ #define OSRM_EXTRACTOR_SUFFIX_LIST_HPP_ #include +#include #include - -#include "util/string_view.hpp" +#include namespace osrm { diff --git a/include/util/indexed_data.hpp b/include/util/indexed_data.hpp index d62105d42..a09425b33 100644 --- a/include/util/indexed_data.hpp +++ b/include/util/indexed_data.hpp @@ -4,7 +4,6 @@ #include "storage/tar_fwd.hpp" #include "util/exception.hpp" -#include "util/string_view.hpp" #include "util/vector_view.hpp" #include @@ -14,6 +13,7 @@ #include #include #include +#include #include namespace osrm diff --git a/include/util/string_view.hpp b/include/util/string_view.hpp deleted file mode 100644 index 77cbdb200..000000000 --- a/include/util/string_view.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OSRM_STRING_VIEW_HPP -#define OSRM_STRING_VIEW_HPP - -#include -#include - -namespace osrm -{ -namespace util -{ -// Convenience typedef: boost::string_ref, boost::string_view or C++17's string_view -// using StringView = std::string_view; - -} // namespace util -} // namespace osrm - -#endif /* OSRM_STRING_VIEW_HPP */ diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp index d69dacec5..94490662a 100644 --- a/src/engine/plugins/tile.cpp +++ b/src/engine/plugins/tile.cpp @@ -4,7 +4,6 @@ #include "engine/plugins/tile.hpp" #include "util/coordinate_calculation.hpp" -#include "util/string_view.hpp" #include "util/vector_tile.hpp" #include "util/web_mercator.hpp" @@ -20,6 +19,7 @@ #include #include #include +#include #include #include