From 6cf1230c134b6b23daa7d4e7458c2ed6df926a91 Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Tue, 13 Jan 2004 14:22:39 +0000 Subject: [PATCH] tweaked the models section of counting_iterator [SVN r21678] --- doc/counting_iterator.html | 16 ++++++++++------ doc/counting_iterator_ref.rst | 15 ++++++++++----- doc/facade-and-adaptor.html | 16 ++++++++++------ 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/doc/counting_iterator.html b/doc/counting_iterator.html index eb218e3..305714f 100644 --- a/doc/counting_iterator.html +++ b/doc/counting_iterator.html @@ -97,8 +97,7 @@ type. Otherwise difference_typenumeric_limits<Incrementable>::is_specialized, then iterator_category is a type convertible to random_access_iterator_tag. Otherwise, iterator_category is -unspecified, and the counting_iterator specialization models the -same iterator traversal concepts modeled by Incrementable.

+unspecified.

[Note: implementers are encouraged to provide an implementation of
operator- and a difference_type that avoids overflows in @@ -135,9 +134,14 @@ i < j;

counting_iterator models

Specializations of counting_iterator model Readable Lvalue Iterator. In addition, they model the concepts corresponding to the -iterator tags to which their iterator_category is convertible and -also corresponding to CategoryOrTraversal when -CategoryOrTraversal is an iterator tag (and not use_default).

+iterator tags to which their iterator_category is convertible. +Also, if CategoryOrTraversal is not use_default then +counting_iterator models the concept corresponding to the iterator +tag CategoryOrTraversal. Otherwise, if +numeric_limits<Incrementable>::is_specialized, then +counting_iterator models Random Access Traversal Iterator. +Otherwise, counting_iterator models the same iterator traversal +concepts modeled by Incrementable.

counting_iterator operations

@@ -264,7 +268,7 @@ indirectly printing out the numbers from 0 to 7
View document source. -Generated on: 2004-01-13 14:10 UTC. +Generated on: 2004-01-13 14:22 UTC. Generated by Docutils from reStructuredText source.
diff --git a/doc/counting_iterator_ref.rst b/doc/counting_iterator_ref.rst index 697e60c..833a778 100644 --- a/doc/counting_iterator_ref.rst +++ b/doc/counting_iterator_ref.rst @@ -35,8 +35,7 @@ If ``CategoryOrTraversal`` is not ``use_default`` then the member ``numeric_limits::is_specialized``, then ``iterator_category`` is a type convertible to ``random_access_iterator_tag``. Otherwise, ``iterator_category`` is -unspecified, and the ``counting_iterator`` specialization models the -same iterator traversal concepts modeled by ``Incrementable``. +unspecified. [*Note:* implementers are encouraged to provide an implementation of ``operator-`` and a ``difference_type`` that avoids overflows in @@ -75,9 +74,15 @@ the following must must also be valid:: Specializations of ``counting_iterator`` model Readable Lvalue Iterator. In addition, they model the concepts corresponding to the -iterator tags to which their ``iterator_category`` is convertible and -also corresponding to ``CategoryOrTraversal`` when -``CategoryOrTraversal`` is an iterator tag (and not ``use_default``). +iterator tags to which their ``iterator_category`` is convertible. +Also, if ``CategoryOrTraversal`` is not ``use_default`` then +``counting_iterator`` models the concept corresponding to the iterator +tag ``CategoryOrTraversal``. Otherwise, if +``numeric_limits::is_specialized``, then +``counting_iterator`` models Random Access Traversal Iterator. +Otherwise, ``counting_iterator`` models the same iterator traversal +concepts modeled by ``Incrementable``. + ``counting_iterator`` operations diff --git a/doc/facade-and-adaptor.html b/doc/facade-and-adaptor.html index d234f43..a81aa5e 100755 --- a/doc/facade-and-adaptor.html +++ b/doc/facade-and-adaptor.html @@ -2134,8 +2134,7 @@ type. Otherwise difference_typenumeric_limits<Incrementable>::is_specialized, then iterator_category is a type convertible to random_access_iterator_tag. Otherwise, iterator_category is -unspecified, and the counting_iterator specialization models the -same iterator traversal concepts modeled by Incrementable.

+unspecified.

[Note: implementers are encouraged to provide an implementation of
operator- and a difference_type that avoids overflows in @@ -2172,9 +2171,14 @@ i < j;

counting_iterator models

Specializations of counting_iterator model Readable Lvalue Iterator. In addition, they model the concepts corresponding to the -iterator tags to which their iterator_category is convertible and -also corresponding to CategoryOrTraversal when -CategoryOrTraversal is an iterator tag (and not use_default).

+iterator tags to which their iterator_category is convertible. +Also, if CategoryOrTraversal is not use_default then +counting_iterator models the concept corresponding to the iterator +tag CategoryOrTraversal. Otherwise, if +numeric_limits<Incrementable>::is_specialized, then +counting_iterator models Random Access Traversal Iterator. +Otherwise, counting_iterator models the same iterator traversal +concepts modeled by Incrementable.

counting_iterator operations

@@ -2346,7 +2350,7 @@ LocalWords: OtherIncrementable Coplien -->
View document source. -Generated on: 2004-01-13 14:13 UTC. +Generated on: 2004-01-13 14:22 UTC. Generated by Docutils from reStructuredText source.