diff --git a/doc/new-iter-concepts.html b/doc/new-iter-concepts.html index 9dcc450..e49ef96 100755 --- a/doc/new-iter-concepts.html +++ b/doc/new-iter-concepts.html @@ -608,12 +608,12 @@ Pass Iterator, the following expressions are valid and respect the stated semantics.

---+++ - + @@ -623,17 +623,14 @@ stated semantics.

- + - +
Forward Traversal Iterator Requirements (in addition to Single Pass Iterator)
Forward Traversal Iterator Requirements (in addition to Default Constructible and Single Pass Iterator)
Expression Return Type
X u; X&note: u may -have a singular -value.note: u may have a +singular value.
++r X&r == s and -r is -dereferenceable -implies ++r -== ++s.r == s and r is +dereferenceable implies +++r == ++s.
iterator_traits<X>::difference_type A signed integral type representing @@ -881,7 +878,7 @@ LocalWords: TraversalTag typename lvalues DWA Hmm JGS mis enum --> diff --git a/doc/new-iter-concepts.rst b/doc/new-iter-concepts.rst index 9144d1b..d30e6ec 100644 --- a/doc/new-iter-concepts.rst +++ b/doc/new-iter-concepts.rst @@ -525,28 +525,25 @@ concept if, in addition to ``X`` meeting the requirements of Single Pass Iterator, the following expressions are valid and respect the stated semantics. -+-------------------------------------------------------------------------------------------+ -|Forward Traversal Iterator Requirements (in addition to Single Pass Iterator) | -+---------------------------------------+-----------------------------------+---------------+ -|Expression |Return Type |Assertion/Note | -+=======================================+===================================+===============+ -|``X u;`` |``X&`` |note: ``u`` may| -| | |have a singular| -| | |value. | -+---------------------------------------+-----------------------------------+---------------+ -|``++r`` |``X&`` |``r == s`` and | -| | |``r`` is | -| | |dereferenceable| -| | |implies ``++r | -| | |== ++s.`` | -+---------------------------------------+-----------------------------------+---------------+ -|``iterator_traits::difference_type``|A signed integral type representing| | -| |the distance between iterators | | -| | | | -+---------------------------------------+-----------------------------------+---------------+ -|``traversal_category::type`` |Convertible to | | -| |``forward_traversal_tag`` | | -+---------------------------------------+-----------------------------------+---------------+ ++--------------------------------------------------------------------------------------------------------+ +|Forward Traversal Iterator Requirements (in addition to Default Constructible and Single Pass Iterator) | ++---------------------------------------+-----------------------------------+----------------------------+ +|Expression |Return Type |Assertion/Note | ++=======================================+===================================+============================+ +|``X u;`` |``X&`` |note: ``u`` may have a | +| | |singular value. | ++---------------------------------------+-----------------------------------+----------------------------+ +|``++r`` |``X&`` |``r == s`` and ``r`` is | +| | |dereferenceable implies | +| | |``++r == ++s.`` | ++---------------------------------------+-----------------------------------+----------------------------+ +|``iterator_traits::difference_type``|A signed integral type representing| | +| |the distance between iterators | | +| | | | ++---------------------------------------+-----------------------------------+----------------------------+ +|``traversal_category::type`` |Convertible to | | +| |``forward_traversal_tag`` | | ++---------------------------------------+-----------------------------------+----------------------------+ .. TR1: forward_traversal_iterator_tag changed to forward_traversal_tag for consistency