From f7dfc36a9c190e575b8c9eb0622d31ded61579c9 Mon Sep 17 00:00:00 2001 From: morinmorin Date: Mon, 28 Aug 2017 20:39:10 +0900 Subject: [PATCH 1/4] Port rst docs changeset to quickbook (ad90dac). UnaryFunction is treated as a const object, but the documentation was missing the const qualification. --- doc/quickbook/transform_iterator.qbk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/quickbook/transform_iterator.qbk b/doc/quickbook/transform_iterator.qbk index adf30b8..847ec79 100644 --- a/doc/quickbook/transform_iterator.qbk +++ b/doc/quickbook/transform_iterator.qbk @@ -86,7 +86,7 @@ The source code for this example can be found If `Reference` is `use_default` then the `reference` member of `transform_iterator` is[br] -`result_of::reference)>::type`. +`result_of::reference)>::type`. Otherwise, `reference` is `Reference`. @@ -110,10 +110,10 @@ convertible to `input_iterator_tag`. The type `UnaryFunction` must be Assignable, Copy Constructible, and -the expression `f(*i)` must be valid where `f` is an object of +the expression `f(*i)` must be valid where `f` is a const object of type `UnaryFunction`, `i` is an object of type `Iterator`, and where the type of `f(*i)` must be -`result_of::reference)>::type`. +`result_of::reference)>::type`. The argument `Iterator` shall model Readable Iterator. From 048c3dfa7227f9323b9bdbcacba6521c29359cc2 Mon Sep 17 00:00:00 2001 From: morinmorin Date: Mon, 28 Aug 2017 20:40:47 +0900 Subject: [PATCH 2/4] Port rst docs changeset to quickbook (daac0f2). The argument order is flipped in the documentation. --- doc/quickbook/facade.qbk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/quickbook/facade.qbk b/doc/quickbook/facade.qbk index 3830ad6..7ca3809 100644 --- a/doc/quickbook/facade.qbk +++ b/doc/quickbook/facade.qbk @@ -289,7 +289,7 @@ The `iterator_category` member of `iterator_facade` is .. parsed-literal:: - *iterator-category*\ (CategoryOrTraversal, value_type, reference) + *iterator-category*\ (CategoryOrTraversal, reference, value_type) where *iterator-category* is defined as follows: From 25dc5c6c9cd2fcca1de9f0d8c2990ef210e4130a Mon Sep 17 00:00:00 2001 From: morinmorin Date: Mon, 28 Aug 2017 20:42:43 +0900 Subject: [PATCH 3/4] Port rst docs changeset to quickbook (6368d38). Fix base class for const_node_iterator. --- doc/quickbook/facade_tutorial.qbk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/quickbook/facade_tutorial.qbk b/doc/quickbook/facade_tutorial.qbk index 756c11e..ad066c8 100644 --- a/doc/quickbook/facade_tutorial.qbk +++ b/doc/quickbook/facade_tutorial.qbk @@ -285,7 +285,7 @@ changes: class const_node_iterator : public boost::iterator_facade< - node_iterator + const_node_iterator , node_base **const** , boost::forward_traversal_tag > From de07014e9a44206b156075fa8a0df06e7aa131ac Mon Sep 17 00:00:00 2001 From: morinmorin Date: Mon, 28 Aug 2017 20:47:09 +0900 Subject: [PATCH 4/4] Port rst docs changeset to quickbook (230d47e). Move difference_type from the Forward Traversal Iterator concept to the Single Pass Traversal concept. --- doc/quickbook/concepts.qbk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/quickbook/concepts.qbk b/doc/quickbook/concepts.qbk index 4b53ed2..8f53574 100644 --- a/doc/quickbook/concepts.qbk +++ b/doc/quickbook/concepts.qbk @@ -175,6 +175,11 @@ semantics. [convertible to `bool`] [`!(a == b)`] ] + [ + [`iterator_traits::difference_type`] + [A signed integral type representing the distance between iterators] + [] + ] [ [`iterator_traversal::type`] [Convertible to`single_pass_traversal_tag`] @@ -207,11 +212,6 @@ valid and respect the stated semantics. [`X&`] [`r == s` and `r` is dereferenceable implies `++r == ++s.`] ] - [ - [`iterator_traits::difference_type`] - [A signed integral type representing the distance between iterators] - [] - ] [ [`iterator_traversal::type`] [Convertible to `forward_traversal_tag`]