From ea3baba3768883d96ce0e1ce032172e8024d0110 Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Tue, 13 Jan 2004 18:17:27 +0000 Subject: [PATCH] changed the stuff about iterator_category in reverse_iterator to match the language we decided on for filter_iterator [SVN r21687] --- doc/facade-and-adaptor.html | 23 ++++++++--------------- doc/reverse_iterator.html | 23 ++++++++--------------- doc/reverse_iterator_ref.rst | 22 +++++++--------------- 3 files changed, 23 insertions(+), 45 deletions(-) diff --git a/doc/facade-and-adaptor.html b/doc/facade-and-adaptor.html index 6ae7ed3..12fc870 100755 --- a/doc/facade-and-adaptor.html +++ b/doc/facade-and-adaptor.html @@ -1493,20 +1493,13 @@ private: Iterator m_iterator; // exposition }; -

The iterator_category member is a type convertible to the iterator -tag given by the following algorithm. Let T be -iterator_traits<Iterator>::value_type, R be -iterator_traits<Iterator>::reference, and C be -traveral_category<Iterator>::type.

-
-if (R is a reference to T) then
-    if (C is convertible to random_access_traversal_tag) then
-        random_access_iterator_tag
-    else
-        bidirectional_iterator_tag
-else
-    input_iterator_tag
-
+

If Iterator models Random Access Traversal Iterator and Readable +Lvalue Iterator, then iterator_category is convertible to +random_access_iterator_tag. Otherwise, if +Iterator models Bidirectional Traversal Iterator and Readable +Lvalue Iterator, then iterator_category is convertible to +bidirectional_iterator_tag. Otherwise, iterator_category is +convertible to input_iterator_tag.

reverse_iterator requirements

@@ -2340,7 +2333,7 @@ LocalWords: OtherIncrementable Coplien -->
View document source. -Generated on: 2004-01-13 18:07 UTC. +Generated on: 2004-01-13 18:15 UTC. Generated by Docutils from reStructuredText source.
diff --git a/doc/reverse_iterator.html b/doc/reverse_iterator.html index 599002b..60dfba3 100644 --- a/doc/reverse_iterator.html +++ b/doc/reverse_iterator.html @@ -80,20 +80,13 @@ private: Iterator m_iterator; // exposition }; -

The iterator_category member is a type convertible to the iterator -tag given by the following algorithm. Let T be -iterator_traits<Iterator>::value_type, R be -iterator_traits<Iterator>::reference, and C be -traveral_category<Iterator>::type.

-
-if (R is a reference to T) then
-    if (C is convertible to random_access_traversal_tag) then
-        random_access_iterator_tag
-    else
-        bidirectional_iterator_tag
-else
-    input_iterator_tag
-
+

If Iterator models Random Access Traversal Iterator and Readable +Lvalue Iterator, then iterator_category is convertible to +random_access_iterator_tag. Otherwise, if +Iterator models Bidirectional Traversal Iterator and Readable +Lvalue Iterator, then iterator_category is convertible to +bidirectional_iterator_tag. Otherwise, iterator_category is +convertible to input_iterator_tag.

reverse_iterator requirements

@@ -276,7 +269,7 @@ sequence in double-reversed (normal) order: hello world!
View document source. -Generated on: 2004-01-13 14:26 UTC. +Generated on: 2004-01-13 18:15 UTC. Generated by Docutils from reStructuredText source.
diff --git a/doc/reverse_iterator_ref.rst b/doc/reverse_iterator_ref.rst index 4d9861d..22a1dc5 100644 --- a/doc/reverse_iterator_ref.rst +++ b/doc/reverse_iterator_ref.rst @@ -27,21 +27,13 @@ }; -The ``iterator_category`` member is a type convertible to the iterator -tag given by the following algorithm. Let ``T`` be -``iterator_traits::value_type``, ``R`` be -``iterator_traits::reference``, and ``C`` be -``traveral_category::type``. - -:: - - if (R is a reference to T) then - if (C is convertible to random_access_traversal_tag) then - random_access_iterator_tag - else - bidirectional_iterator_tag - else - input_iterator_tag +If ``Iterator`` models Random Access Traversal Iterator and Readable +Lvalue Iterator, then ``iterator_category`` is convertible to +``random_access_iterator_tag``. Otherwise, if +``Iterator`` models Bidirectional Traversal Iterator and Readable +Lvalue Iterator, then ``iterator_category`` is convertible to +``bidirectional_iterator_tag``. Otherwise, ``iterator_category`` is +convertible to ``input_iterator_tag``.