diff --git a/doc/filter_iterator.html b/doc/filter_iterator.html index 7f59689..37ca104 100644 --- a/doc/filter_iterator.html +++ b/doc/filter_iterator.html @@ -7,7 +7,7 @@ Filter Iterator - + @@ -27,7 +27,7 @@ Lab, University of Hanover Institute for Transport Railway Operation and Construction Date: -2003-09-14 +2004-01-11 Copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved @@ -80,9 +80,11 @@ class filter_iterator ); Predicate predicate() const; Iterator end() const; + reference operator*() const; + filter_iterator& operator++(); }; -

The iterator_category is a type convertible to the tags +

The iterator_category member is a type convertible to the tags corresponding to each standard concept modeled by filter_iterator, as described in the models section.

@@ -212,8 +214,8 @@ whose end is a default constru -Returns:A filter_iterator at position x that filters according -to predicate f and that will not increment past end. +Returns:A filter_iterator at the first position in the range [x,end) +such that f(*this->base()) == true or else at position end. @@ -224,6 +226,10 @@ to predicate f and that will n Requires:Predicate must be Default Constructible. +Returns:A filter_iterator at the first position in the range [x,end) +such that f(*this->base()) == true, where f is a default +constructed Predicate, or else at position end. + Returns:A filter_iterator at position x that filters according to a default constructed Predicate and that will not increment past end. @@ -243,7 +249,8 @@ filter_iterator( Requires:OtherIterator is implicitly convertible to Iterator. -Returns:A copy of iterator t. +Returns:A filter iterator at the same position as iterator t +whose predicate and end are copies of t.predicate and t.end() . @@ -265,6 +272,26 @@ filter_iterator( +

reference operator*() const;

+ +++ + + + +
Returns:*(this->base())
+

filter_iterator& operator++();

+ +++ + + + +
Effects:Increments *this and then continues to +increment *this until either this->base() == this->end() +or f(**this) == true.

Example

diff --git a/doc/filter_iterator_ref.rst b/doc/filter_iterator_ref.rst index b0bc3ec..1b0f921 100644 --- a/doc/filter_iterator_ref.rst +++ b/doc/filter_iterator_ref.rst @@ -20,6 +20,8 @@ ); Predicate predicate() const; Iterator end() const; + reference operator*() const; + filter_iterator& operator++(); }; @@ -152,7 +154,7 @@ operations. -``reference operator*();`` +``reference operator*() const;`` :Returns: ``*(this->base())``