diff --git a/doc/facade-and-adaptor.html b/doc/facade-and-adaptor.html index 3ec8941..7150824 100755 --- a/doc/facade-and-adaptor.html +++ b/doc/facade-and-adaptor.html @@ -1854,14 +1854,16 @@ class filter_iterator reference operator*() const; filter_iterator& operator++(); private: - Predicate m_pred; // exposition - Iterator m_iter; // exposition - Iterator m_end; // exposition + Predicate m_pred; // exposition only + Iterator m_iter; // exposition only + Iterator m_end; // exposition only }; -

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.

+

If the Iterator argument models Readable Lvalue Iterator and +Forward Traversal Iterator then the iterator_category member is a +type convertible to std::forward_iterator_tag. Otherwise +iterator_category is a type convertible to +std::input_iterator_tag.

filter_iterator requirements

@@ -2306,7 +2308,7 @@ LocalWords: OtherIncrementable Coplien --> diff --git a/doc/filter_iterator.html b/doc/filter_iterator.html index 62addf6..6b9bab6 100644 --- a/doc/filter_iterator.html +++ b/doc/filter_iterator.html @@ -86,14 +86,16 @@ class filter_iterator reference operator*() const; filter_iterator& operator++(); private: - Predicate m_pred; // exposition - Iterator m_iter; // exposition - Iterator m_end; // exposition + Predicate m_pred; // exposition only + Iterator m_iter; // exposition only + Iterator m_end; // exposition only }; -

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.

+

If the Iterator argument models Readable Lvalue Iterator and +Forward Traversal Iterator then the iterator_category member is a +type convertible to std::forward_iterator_tag. Otherwise +iterator_category is a type convertible to +std::input_iterator_tag.

filter_iterator requirements

@@ -384,7 +386,7 @@ int main() diff --git a/doc/filter_iterator_ref.rst b/doc/filter_iterator_ref.rst index 172d732..cba8594 100644 --- a/doc/filter_iterator_ref.rst +++ b/doc/filter_iterator_ref.rst @@ -24,15 +24,17 @@ reference operator*() const; filter_iterator& operator++(); private: - Predicate m_pred; // exposition - Iterator m_iter; // exposition - Iterator m_end; // exposition + Predicate m_pred; // exposition only + Iterator m_iter; // exposition only + Iterator m_end; // exposition only }; -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. +If the ``Iterator`` argument models Readable Lvalue Iterator and +Forward Traversal Iterator then the ``iterator_category`` member is a +type convertible to ``std::forward_iterator_tag``. Otherwise +``iterator_category`` is a type convertible to +``std::input_iterator_tag``. @@ -157,4 +159,4 @@ operations. :Effects: Increments ``m_iter`` and then continues to increment ``m_iter`` until either ``m_iter == m_end`` or ``m_pred(*m_iter) == true``. -:Returns: ``*this`` \ No newline at end of file +:Returns: ``*this``