diff --git a/ostd/range.hh b/ostd/range.hh index 13c620f..652a91e 100644 --- a/ostd/range.hh +++ b/ostd/range.hh @@ -815,8 +815,18 @@ NumberRange range(T v) { template struct PointerRange: InputRange, ContiguousRangeTag, T> { +private: + struct Nat {}; + +public: PointerRange(): p_beg(nullptr), p_end(nullptr) {} - PointerRange(T *beg, T *end): p_beg(beg), p_end(end) {} + + template + PointerRange(T *beg, U end, EnableIf< + (IsPointer::value || IsNullPointer::value) && + IsConvertible::value, Nat + > = Nat()): p_beg(beg), p_end(end) {} + PointerRange(T *beg, Size n): p_beg(beg), p_end(beg + n) {} template + CharRangeBase(T *beg, U end, EnableIf< + (IsPointer::value || IsNullPointer::value) && + IsConvertible::value, Nat + > = Nat()): p_beg(beg), p_end(end) {} + CharRangeBase(T *beg, Size n): p_beg(beg), p_end(beg + n) {} /* TODO: traits for utf-16/utf-32 string lengths, for now assume char */