Merge branch 'feature/comment-fixes' into develop

This commit is contained in:
Daniel James
2014-06-06 01:04:04 +01:00
2 changed files with 4 additions and 10 deletions

View File

@ -106,7 +106,7 @@ The ``iterator_category`` member of ``iterator_facade`` is
.. parsed-literal:: .. parsed-literal::
*iterator-category*\ (CategoryOrTraversal, value_type, reference) *iterator-category*\ (CategoryOrTraversal, reference, value_type)
where *iterator-category* is defined as follows: where *iterator-category* is defined as follows:

View File

@ -73,16 +73,10 @@ struct iterator_writability_disabled
// Convert an iterator_facade's traversal category, Value parameter, // Convert an iterator_facade's traversal category, Value parameter,
// and ::reference type to an appropriate old-style category. // and ::reference type to an appropriate old-style category.
// //
// If writability has been disabled per the above metafunction, the // Due to changeset 21683, this now never results in a category convertible
// result will not be convertible to output_iterator_tag. // to output_iterator_tag.
//
// Otherwise, if Traversal == single_pass_traversal_tag, the following
// conditions will result in a tag that is convertible both to
// input_iterator_tag and output_iterator_tag:
//
// 1. Reference is a reference to non-const
// 2. Reference is not a reference and is convertible to Value
// //
// Change at: https://svn.boost.org/trac/boost/changeset/21683
template <class Traversal, class ValueParam, class Reference> template <class Traversal, class ValueParam, class Reference>
struct iterator_facade_default_category struct iterator_facade_default_category
: mpl::eval_if< : mpl::eval_if<