From 052fa58be40a5f7aef941a6d3039043c2b83d043 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 9 Feb 2017 22:48:28 +0100
Subject: [PATCH] clean up pointer range constructor

---
 ostd/array.hh  |  4 ++--
 ostd/range.hh  | 13 +++----------
 ostd/vector.hh |  4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ostd/array.hh b/ostd/array.hh
index 6f45f02..eb14d0d 100644
--- a/ostd/array.hh
+++ b/ostd/array.hh
@@ -15,14 +15,14 @@ namespace ostd {
 template<typename T, size_t N>
 struct ranged_traits<std::array<T, N>> {
     static PointerRange<T> iter(std::array<T, N> &v) {
-        return PointerRange<T>{v.data(), N};
+        return PointerRange<T>{v.data(), v.data() + N};
     }
 };
 
 template<typename T, size_t N>
 struct ranged_traits<std::array<T, N> const> {
     static PointerRange<T const> iter(std::array<T, N> const &v) {
-        return PointerRange<T const>{v.data(), N};
+        return PointerRange<T const>{v.data(), v.data() + N};
     }
 };
 
diff --git a/ostd/range.hh b/ostd/range.hh
index 241ead5..17a3dda 100644
--- a/ostd/range.hh
+++ b/ostd/range.hh
@@ -1131,14 +1131,7 @@ private:
 
 public:
     PointerRange(): p_beg(nullptr), p_end(nullptr) {}
-
-    template<typename U>
-    PointerRange(T *beg, U end, std::enable_if_t<
-        (std::is_pointer_v<U> || std::is_null_pointer_v<U>) &&
-         std::is_convertible_v<U, T *>, Nat
-    > = Nat()): p_beg(beg), p_end(end) {}
-
-    PointerRange(T *beg, size_t n): p_beg(beg), p_end(beg + n) {}
+    PointerRange(T *beg, T *end): p_beg(beg), p_end(end) {}
 
     template<typename U, typename = std::enable_if_t<
         std::is_convertible_v<U *, T *>
@@ -1297,7 +1290,7 @@ private:
 template<typename T, size_t N>
 struct ranged_traits<T[N]> {
     static PointerRange<T> iter(T (&array)[N]) {
-        return PointerRange<T>(array, N);
+        return PointerRange<T>(array, array + N);
     }
 };
 
@@ -1315,7 +1308,7 @@ inline PointerRange<T> iter(T *a, U b, std::enable_if_t<
 
 template<typename T>
 inline PointerRange<T> iter(T *a, size_t b) {
-    return PointerRange<T>(a, b);
+    return PointerRange<T>(a, a + b);
 }
 
 template<typename T, typename S>
diff --git a/ostd/vector.hh b/ostd/vector.hh
index da1a71c..34cef57 100644
--- a/ostd/vector.hh
+++ b/ostd/vector.hh
@@ -17,14 +17,14 @@ namespace ostd {
 template<typename T, typename A>
 struct ranged_traits<std::vector<T, A>> {
     static PointerRange<T> iter(std::vector<T, A> &v) {
-        return PointerRange<T>{v.data(), v.size()};
+        return PointerRange<T>{v.data(), v.data() + v.size()};
     }
 };
 
 template<typename T, typename A>
 struct ranged_traits<std::vector<T, A> const> {
     static PointerRange<T const> iter(std::vector<T, A> const &v) {
-        return PointerRange<T const>{v.data(), v.size()};
+        return PointerRange<T const>{v.data(), v.data() + v.size()};
     }
 };