From df4b169aa8d4a1fe3875f4f1597057fd2fb8bf95 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 28 Jul 2015 02:40:24 +0100
Subject: [PATCH] better range constraints

---
 ostd/range.hh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ostd/range.hh b/ostd/range.hh
index b104e69..96c9301 100644
--- a/ostd/range.hh
+++ b/ostd/range.hh
@@ -386,6 +386,9 @@ public:
     HalfRange<RangeHalf> iter(const RangeHalf &other) const {
         return HalfRange<RangeHalf>(*this, other);
     }
+
+    RangeValue<T> *data() { return p_range.data(); }
+    const RangeValue<T> *data() const { return p_range.data(); }
 };
 
 template<typename R>
@@ -622,12 +625,15 @@ public:
     bool put(RangeValue<Rtype> &&v) {
         return p_beg.range().put(move(v));
     }
+
+    RangeValue<Rtype> *data() { return p_beg.data(); }
+    const RangeValue<Rtype> *data() const { return p_beg.data(); }
 };
 
 template<typename T>
 struct ReverseRange: InputRange<ReverseRange<T>,
-    RangeCategory<T>, RangeValue<T>, RangeReference<T>, RangeSize<T>,
-    RangeDifference<T>
+    CommonType<RangeCategory<T>, FiniteRandomAccessRangeTag>,
+    RangeValue<T>, RangeReference<T>, RangeSize<T>, RangeDifference<T>
 > {
 private:
     using Rref = RangeReference<T>;
@@ -700,8 +706,8 @@ public:
 
 template<typename T>
 struct MoveRange: InputRange<MoveRange<T>,
-    RangeCategory<T>, RangeValue<T>, RangeValue<T> &&, RangeSize<T>,
-    RangeDifference<T>
+    CommonType<RangeCategory<T>, FiniteRandomAccessRangeTag>,
+    RangeValue<T>, RangeValue<T> &&, RangeSize<T>, RangeDifference<T>
 > {
 private:
     using Rval = RangeValue<T>;