From 722dbbe18fe0f5f5ec057d59d69132036691232b Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 28 Jun 2016 14:06:02 +1000
Subject: [PATCH] view: use decltype for make_view type deduction

some types will not have iterator typedefs but are capable of providing
iterators. use the types that std::begin and friends return instead of
deducing them ourselves.
---
 view.hpp | 4 ++--
 view.ipp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view.hpp b/view.hpp
index 3505cf13..ca5c8c9d 100644
--- a/view.hpp
+++ b/view.hpp
@@ -61,11 +61,11 @@ namespace util {
     };
 
     template <typename T>
-    view<typename T::iterator>
+    auto
     make_view (T&);
 
     template <typename T>
-    view<typename T::const_iterator>
+    auto
     make_view (const T&);
 
     template <typename T>
diff --git a/view.ipp b/view.ipp
index 0f926560..7dcf9622 100644
--- a/view.ipp
+++ b/view.ipp
@@ -152,17 +152,17 @@ util::view<T>::operator== (const view<T> rhs) const noexcept
 
 ///////////////////////////////////////////////////////////////////////////////
 template <typename T>
-util::view<typename T::iterator>
+auto
 util::make_view (T &t)
 {
-    return util::view<typename T::iterator> { t.begin (), t.end () };
+    return util::view<decltype(std::begin (t))> { t.begin (), t.end () };
 }
 
 
 //-----------------------------------------------------------------------------
 template <typename T>
-util::view<typename T::const_iterator>
+auto
 util::make_view (const T &t)
 {
-    return util::view<typename T::const_iterator> { t.cbegin (), t.cend () };
+    return util::view<decltype(std::cbegin (t))> { t.cbegin (), t.cend () };
 }