Made core interface private in iterator_adaptor, added base_reference() for Derived classes.

[SVN r1200]
This commit is contained in:
Dave Abrahams
2003-04-26 15:32:50 +00:00
parent c9dac5c7fb
commit ee71d493b6
4 changed files with 46 additions and 38 deletions
+29 -29
View File
@@ -20,44 +20,44 @@ namespace boost
//
//
template <class Iterator>
class reverse_iterator :
public iterator_adaptor< reverse_iterator<Iterator>, Iterator >
class reverse_iterator
: public iterator_adaptor< reverse_iterator<Iterator>, Iterator >
{
typedef iterator_adaptor< reverse_iterator<Iterator>, Iterator > super_t;
typedef iterator_adaptor< reverse_iterator<Iterator>, Iterator > super_t;
friend class iterator_core_access;
friend class iterator_core_access;
public:
reverse_iterator() {}
public:
reverse_iterator() {}
explicit reverse_iterator(Iterator x)
: super_t(x) {}
explicit reverse_iterator(Iterator x)
: super_t(x) {}
template<class OtherIterator>
reverse_iterator(
reverse_iterator<OtherIterator> const& r
, typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
)
: super_t(r.base())
{}
template<class OtherIterator>
reverse_iterator(
reverse_iterator<OtherIterator> const& r
, typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
)
: super_t(r.base())
{}
private:
typename super_t::reference dereference() const { return *boost::prior(this->base()); }
private:
typename super_t::reference dereference() const { return *boost::prior(this->base()); }
void increment() { super_t::decrement(); }
void decrement() { super_t::increment(); }
void increment() { --this->base_reference(); }
void decrement() { ++this->base_reference(); }
void advance(typename super_t::difference_type n)
{
super_t::advance(-n);
}
void advance(typename super_t::difference_type n)
{
this->base_reference() += -n;
}
template <class OtherIterator>
typename super_t::difference_type
distance_to(reverse_iterator<OtherIterator> const& y) const
{
return -super_t::distance_to(y);
}
template <class OtherIterator>
typename super_t::difference_type
distance_to(reverse_iterator<OtherIterator> const& y) const
{
return this->base_reference() - y.base();
}
};
template <class BidirectionalIterator>