Import std::begin/std::end so that container utils work correctly with non std containers

2 files changed, 4 insertions, 11 deletions

diff --git a/src/string.hh b/src/string.hh
index 55276d73..bdb28dd7 100644
--- a/src/string.hh
+++ b/src/string.hh
@@ -196,16 +196,6 @@ inline StringView String::substr(CharCount pos, CharCount length) const
     return StringView{*this}.substr(pos, length);
 }
 
-inline const char* begin(StringView str)
-{
-    return str.begin();
-}
-
-inline const char* end(StringView str)
-{
-    return str.end();
-}
-
 inline String operator+(const char* lhs, const String& rhs)
 {
     return String(lhs) + rhs;
diff --git a/src/utils.hh b/src/utils.hh
index 9bb7c007..a71c7700 100644
--- a/src/utils.hh
+++ b/src/utils.hh
@@ -90,6 +90,10 @@ ReversedContainer<Container> reversed(Container&& container)
     return ReversedContainer<Container>(container);
 }
 
+// Todo: move that into the following functions once we can remove the decltype
+//       return type.
+using std::begin;
+using std::end;
 
 template<typename Container, typename T>
 auto find(Container&& container, const T& value) -> decltype(begin(container))
@@ -103,7 +107,6 @@ auto find_if(Container&& container, T op) -> decltype(begin(container))
     return std::find_if(begin(container), end(container), op);
 }
 
-
 template<typename Container, typename T>
 bool contains(Container&& container, const T& value)
 {