diff --git a/doc/new-iter-concepts.html b/doc/new-iter-concepts.html index 380256b..848c882 100755 --- a/doc/new-iter-concepts.html +++ b/doc/new-iter-concepts.html @@ -235,8 +235,8 @@ Bidirectional Iterator (2) -> Bidirectional Traversal Iterator and Writable I
The iterator requirements are to be separated into two hierarchies. One -set of concepts handles the syntax and semantics of value access:
+The iterator requirements are to be separated into two groups. One set +of concepts handles the syntax and semantics of value access:
We provide an access mechanism for mapping iterator types to the new traversal tags and access bitfield. Our design reuses iterator_traits<Iter>::iterator_category as the access -mechanism. To that end, a pair of access and traversal tags are -combined into a single type using the following iterator_tag class.
+mechanism. To that end, the access and traversal information is +bundled into a single type using the following iterator_tag class.enum iterator_access { readable_iterator = 1, writable_iterator = 2, swappable_iterator = 4, lvalue_iterator = 8 }; diff --git a/doc/new-iter-concepts.rst b/doc/new-iter-concepts.rst index dca1700..381449d 100644 --- a/doc/new-iter-concepts.rst +++ b/doc/new-iter-concepts.rst @@ -208,8 +208,8 @@ Input Iterator (2) -> Incrementable Iterator and Readable Iterator Design ======== -The iterator requirements are to be separated into two hierarchies. One -set of concepts handles the syntax and semantics of value access: +The iterator requirements are to be separated into two groups. One set +of concepts handles the syntax and semantics of value access: - Readable Iterator - Writable Iterator @@ -256,8 +256,8 @@ but instead use the equivalent of a bitfield. We provide an access mechanism for mapping iterator types to the new traversal tags and access bitfield. Our design reuses ``iterator_traits::iterator_category`` as the access -mechanism. To that end, a pair of access and traversal tags are -combined into a single type using the following `iterator_tag` class. +mechanism. To that end, the access and traversal information is +bundled into a single type using the following `iterator_tag` class. ::