songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Menelaos Karavelas 2003-05-07 01:03:32 +00:00
parent 0eca5b6f95
commit ffb4966e7f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Packages/STL_Extension/include/CGAL/Nested_iterator.h
View File

@ -96,7 +96,6 @@ public:
typedef typename Tr::Nested_iterator Iterator; typedef typename Tr::Nested_iterator Iterator;
protected: protected:
typedef Nested_iterator<Base_iterator, Traits> Self;
typedef CGALi:: typedef CGALi::
FI_w_begin_end< Filter_iterator<Base_iterator, FI_w_begin_end< Filter_iterator<Base_iterator,
CGALi::Emptyness_predicate<Tr> > > CGALi::Emptyness_predicate<Tr> > >
@ -122,7 +121,7 @@ public:
} }
} }
Self& operator++() Nested_iterator& operator++()
{ {
if ( nested_it_ != end( this->base() ) ) { if ( nested_it_ != end( this->base() ) ) {
++nested_it_; ++nested_it_;
@ -136,14 +135,14 @@ public:
return *this; return *this;
} }
Self operator++(int) Nested_iterator operator++(int)
{ {
Self tmp = *this; Nested_iterator tmp = *this;
++(*this); ++(*this);
return tmp; return tmp;
} }
Self& operator--() Nested_iterator& operator--()
{ {
if ( this->is_end() ) { if ( this->is_end() ) {
Filter_base_iterator::operator--(); Filter_base_iterator::operator--();
@ -159,9 +158,9 @@ public:
return *this; return *this;
} }
Self operator--(int) Nested_iterator operator--(int)
{ {
Self tmp = *this; Nested_iterator tmp = *this;
--(*this); --(*this);
return tmp; return tmp;
} }
@ -177,7 +176,8 @@ public:
return nested_it_.operator->(); return nested_it_.operator->();
} }
friend bool operator== <>(const Self&, const Self&); friend bool operator== <>(const Nested_iterator&,
const Nested_iterator&);
protected: protected:
Iterator nested_it_; Iterator nested_it_;