JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "add range difference type" 

This reverts commit 4adbeb4e1b.
master
Daniel Kolesa 2015-05-23 17:56:08 +01:00
parent 4adbeb4e1b
commit b90fce8d84
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
octa/range.h
View File

@ -19,11 +19,10 @@ namespace octa {
struct BidirectionalRangeTag {}; struct BidirectionalRangeTag {};
struct RandomAccessRangeTag {}; struct RandomAccessRangeTag {};
template<typename T> using RangeCategory = typename T::Category; template<typename T> using RangeCategory = typename T::Category;
template<typename T> using RangeSize = typename T::SizeType; template<typename T> using RangeSize = typename T::SizeType;
template<typename T> using RangeDifference = typename T::DiffType; template<typename T> using RangeValue = typename T::ValType;
template<typename T> using RangeValue = typename T::ValType; template<typename T> using RangeReference = typename T::RefType;
template<typename T> using RangeReference = typename T::RefType;
template<typename T> template<typename T>
struct __OctaRangeIterator { struct __OctaRangeIterator {
@ -63,11 +62,10 @@ namespace octa {
} }
template<typename B, typename C, typename V, typename R = V &, template<typename B, typename C, typename V, typename R = V &,
typename S = size_t, typename D = ptrdiff_t typename S = size_t
> struct InputRange { > struct InputRange {
typedef C Category; typedef C Category;
typedef S SizeType; typedef S SizeType;
typedef D DiffType;
typedef V ValType; typedef V ValType;
typedef R RefType; typedef R RefType;
@ -87,20 +85,17 @@ namespace octa {
} }
}; };
template<typename V, typename R = V &, typename S = size_t, template<typename V, typename R = V &, typename S = size_t>
typename D = ptrdiff_t struct OutputRange {
> struct OutputRange {
typedef OutputRangeTag Category; typedef OutputRangeTag Category;
typedef S SizeType; typedef S SizeType;
typedef D DiffType;
typedef V ValType; typedef V ValType;
typedef R RefType; typedef R RefType;
}; };
template<typename T> template<typename T>
struct ReverseRange: InputRange<ReverseRange<T>, struct ReverseRange: InputRange<ReverseRange<T>,
RangeCategory<T>, RangeValue<T>, RangeReference<T>, RangeSize<T>, RangeCategory<T>, RangeValue<T>, RangeReference<T>, RangeSize<T>
RangeDifference<T>
> { > {
private: private:
typedef RangeReference<T> r_ref; typedef RangeReference<T> r_ref;
@ -197,8 +192,7 @@ namespace octa {
template<typename T> template<typename T>
struct MoveRange: InputRange<MoveRange<T>, struct MoveRange: InputRange<MoveRange<T>,
RangeCategory<T>, RangeValue<T>, RangeValue<T> &&, RangeSize<T>, RangeCategory<T>, RangeValue<T>, RangeValue<T> &&, RangeSize<T>
RangeDifference<T>
> { > {
private: private:
typedef RangeValue<T> r_val; typedef RangeValue<T> r_val;
@ -418,7 +412,7 @@ namespace octa {
struct EnumeratedRange: InputRange<EnumeratedRange<T>, struct EnumeratedRange: InputRange<EnumeratedRange<T>,
InputRangeTag, RangeValue<T>, InputRangeTag, RangeValue<T>,
EnumeratedValue<RangeReference<T>, RangeSize<T>>, EnumeratedValue<RangeReference<T>, RangeSize<T>>,
RangeSize<T>, RangeDifference<T> RangeSize<T>
> { > {
private: private:
typedef RangeReference<T> r_ref; typedef RangeReference<T> r_ref;