diff --git a/octa/range.h b/octa/range.h index 0933b48..2f13bfe 100644 --- a/octa/range.h +++ b/octa/range.h @@ -19,11 +19,10 @@ namespace octa { struct BidirectionalRangeTag {}; struct RandomAccessRangeTag {}; - template using RangeCategory = typename T::Category; - template using RangeSize = typename T::SizeType; - template using RangeDifference = typename T::DiffType; - template using RangeValue = typename T::ValType; - template using RangeReference = typename T::RefType; + template using RangeCategory = typename T::Category; + template using RangeSize = typename T::SizeType; + template using RangeValue = typename T::ValType; + template using RangeReference = typename T::RefType; template struct __OctaRangeIterator { @@ -63,11 +62,10 @@ namespace octa { } template struct InputRange { typedef C Category; typedef S SizeType; - typedef D DiffType; typedef V ValType; typedef R RefType; @@ -87,20 +85,17 @@ namespace octa { } }; - template struct OutputRange { + template + struct OutputRange { typedef OutputRangeTag Category; typedef S SizeType; - typedef D DiffType; typedef V ValType; typedef R RefType; }; template struct ReverseRange: InputRange, - RangeCategory, RangeValue, RangeReference, RangeSize, - RangeDifference + RangeCategory, RangeValue, RangeReference, RangeSize > { private: typedef RangeReference r_ref; @@ -197,8 +192,7 @@ namespace octa { template struct MoveRange: InputRange, - RangeCategory, RangeValue, RangeValue &&, RangeSize, - RangeDifference + RangeCategory, RangeValue, RangeValue &&, RangeSize > { private: typedef RangeValue r_val; @@ -418,7 +412,7 @@ namespace octa { struct EnumeratedRange: InputRange, InputRangeTag, RangeValue, EnumeratedValue, RangeSize>, - RangeSize, RangeDifference + RangeSize > { private: typedef RangeReference r_ref;