Merge branch 'develop'

# Conflicts: # include/boost/iterator/reverse_iterator.hpp
Merge pull request #27 from Lastique/advance_generic_distance
2026-01-19 16:22:20 +00:00 · 2017-07-17 12:03:38 -04:00 · 2017-07-12 12:20:34 -04:00 · 2017-07-12 12:17:22 -04:00 · 2017-07-10 14:57:40 +03:00 · 2017-07-10 14:51:07 +03:00
133 changed files with 2888 additions and 2232 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,40 @@
+# Copyright 2016 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+language: cpp
+
+sudo: false
+
+python: "2.7"
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+    - master
+    - develop
+
+install:
+  - cd ..
+  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init --depth 1 tools/build
+  - git submodule update --init --depth 1 libs/config
+  - git submodule update --init --depth 1 tools/boostdep
+  - cp -r $TRAVIS_BUILD_DIR/* libs/iterator
+  - python tools/boostdep/depinst/depinst.py iterator
+  - ./bootstrap.sh
+  - ./b2 headers
+
+script:
+  - TOOLSET=gcc,clang
+  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
+  - ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET || true
+  - ./b2 libs/iterator/test toolset=$TOOLSET
+
+notifications:
+  email:
+    on_success: always
--- a/doc/BidirectionalTraversal.rst
+++ b/doc/BidirectionalTraversal.rst
--- a/doc/ForwardTraversal.rst
+++ b/doc/ForwardTraversal.rst
--- a/doc/GNUmakefile
+++ b/doc/GNUmakefile
--- a/doc/IncrementableIterator.rst
+++ b/doc/IncrementableIterator.rst
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -20,4 +20,8 @@ boostbook standalone
    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/iterator/doc
  ;

-
+###############################################################################
+alias boostdoc ;
+explicit boostdoc ;
+alias boostrelease : standalone ;
+explicit boostrelease ;
--- a/doc/LvalueIterator.rst
+++ b/doc/LvalueIterator.rst
--- a/doc/ReadableIterator.rst
+++ b/doc/ReadableIterator.rst
--- a/doc/SinglePassIterator.rst
+++ b/doc/SinglePassIterator.rst
--- a/doc/SwappableIterator.rst
+++ b/doc/SwappableIterator.rst
--- a/doc/WritableIterator.rst
+++ b/doc/WritableIterator.rst
--- a/doc/counting_iterator.pdf
+++ b/doc/counting_iterator.pdf
--- a/doc/docutils.sty
+++ b/doc/docutils.sty
--- a/doc/facade-and-adaptor.pdf
+++ b/doc/facade-and-adaptor.pdf
--- a/doc/facade_iterator_category.rst
+++ b/doc/facade_iterator_category.rst
--- a/doc/filter_iterator.pdf
+++ b/doc/filter_iterator.pdf
--- a/doc/function_output_iterator.pdf
+++ b/doc/function_output_iterator.pdf
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -115,8 +115,8 @@ __ iterator_facade.pdf
 __ iterator_adaptor.pdf

 Both |facade| and |adaptor| as well as many of the `specialized
-adaptors`_ mentioned below have been proposed for standardization,
-and accepted into the first C++ technical report; see our
+adaptors`_ mentioned below have been proposed for standardization;
+see our

   `Standard Proposal For Iterator Facade and Adaptor`__ (PDF__)

--- a/doc/indirect_iterator.pdf
+++ b/doc/indirect_iterator.pdf
--- a/doc/indirect_reference_ref.rst
+++ b/doc/indirect_reference_ref.rst
--- a/doc/interoperability-revisited.rst
+++ b/doc/interoperability-revisited.rst
--- a/doc/iterator_adaptor.pdf
+++ b/doc/iterator_adaptor.pdf
--- a/doc/iterator_adaptor_tutorial.rst
+++ b/doc/iterator_adaptor_tutorial.rst
--- a/doc/iterator_archetypes.html
+++ b/doc/iterator_archetypes.html
--- a/doc/iterator_archetypes.pdf
+++ b/doc/iterator_archetypes.pdf
--- a/doc/iterator_archetypes.rst
+++ b/doc/iterator_archetypes.rst
--- a/doc/iterator_concepts.pdf
+++ b/doc/iterator_concepts.pdf
--- a/doc/iterator_concepts.rst
+++ b/doc/iterator_concepts.rst
--- a/doc/iterator_facade.pdf
+++ b/doc/iterator_facade.pdf
--- a/doc/iterator_facade_tutorial.rst
+++ b/doc/iterator_facade_tutorial.rst
--- a/doc/iterator_traits.html
+++ b/doc/iterator_traits.html
@@ -3,11 +3,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>Iterator Traits</title>
 <meta name="author" content="David Abrahams" />
 <meta name="organization" content="Boost Consulting" />
-<meta name="date" content="2006-09-11" />
+<meta name="date" content="$Date$" />
 <meta name="copyright" content="Copyright David Abrahams 2004." />
 <link rel="stylesheet" href="../../../rst.css" type="text/css" />
 </head>
@@ -25,7 +25,7 @@
 <tr><th class="docinfo-name">Organization:</th>
 <td><a class="first last reference external" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2006-09-11</td></tr>
+<td>$Date$</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
 <td>Copyright David Abrahams 2004.</td></tr>
 </tbody>
@@ -37,7 +37,7 @@
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">abstract:</th><td class="field-body">Header <tt class="docutils literal"><span class="pre">&lt;boost/iterator/iterator_traits.hpp&gt;</span></tt> provides
+<tr class="field"><th class="field-name">abstract:</th><td class="field-body">Header <tt class="docutils literal">&lt;boost/iterator/iterator_traits.hpp&gt;</tt> provides
 the ability to access an iterator's associated types using
 MPL-compatible <a class="reference external" href="../../mpl/doc/index.html#metafunctions">metafunctions</a>.</td>
 </tr>
@@ -46,15 +46,15 @@ MPL-compatible <a class="reference external" href="../../mpl/doc/index.html#meta
 <div class="section" id="overview">
 <h1>Overview</h1>
 <p><tt class="docutils literal"><span class="pre">std::iterator_traits</span></tt> provides access to five associated types
-of any iterator: its <tt class="docutils literal"><span class="pre">value_type</span></tt>, <tt class="docutils literal"><span class="pre">reference</span></tt>, <tt class="docutils literal"><span class="pre">pointer</span></tt>,
-<tt class="docutils literal"><span class="pre">iterator_category</span></tt>, and <tt class="docutils literal"><span class="pre">difference_type</span></tt>.  Unfortunately,
+of any iterator: its <tt class="docutils literal">value_type</tt>, <tt class="docutils literal">reference</tt>, <tt class="docutils literal">pointer</tt>,
+<tt class="docutils literal">iterator_category</tt>, and <tt class="docutils literal">difference_type</tt>.  Unfortunately,
 such a &quot;multi-valued&quot; traits template can be difficult to use in a
-metaprogramming context.  <tt class="docutils literal"><span class="pre">&lt;boost/iterator/iterator_traits.hpp&gt;</span></tt>
+metaprogramming context.  <tt class="docutils literal">&lt;boost/iterator/iterator_traits.hpp&gt;</tt>
 provides access to these types using a standard <a class="reference external" href="../../mpl/doc/index.html#metafunctions">metafunctions</a>.</p>
 </div>
 <div class="section" id="summary">
 <h1>Summary</h1>
-<p>Header <tt class="docutils literal"><span class="pre">&lt;boost/iterator/iterator_traits.hpp&gt;</span></tt>:</p>
+<p>Header <tt class="docutils literal">&lt;boost/iterator/iterator_traits.hpp&gt;</tt>:</p>
 <pre class="literal-block">
 template &lt;class Iterator&gt;
 struct iterator_value
@@ -98,21 +98,6 @@ struct iterator_category
 };
 </pre>
 </div>
-<div class="section" id="broken-compiler-notes">
-<h1>Broken Compiler Notes</h1>
-<p>Because of workarounds in Boost, you may find that these
-<a class="reference external" href="../../mpl/doc/index.html#metafunctions">metafunctions</a> actually work better than the facilities provided by
-your compiler's standard library.</p>
-<p>On compilers that don't support partial specialization, such as
-Microsoft Visual C++ 6.0 or 7.0, you may need to manually invoke
-<a class="reference external" href="../../type_traits/index.html#transformations">BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION</a> on the
-<tt class="docutils literal"><span class="pre">value_type</span></tt> of pointers that are passed to these metafunctions.</p>
-<p>Because of bugs in the implementation of GCC-2.9x, the name of
-<tt class="docutils literal"><span class="pre">iterator_category</span></tt> is changed to <tt class="docutils literal"><span class="pre">iterator_category_</span></tt> on that
-compiler.  A macro, <tt class="docutils literal"><span class="pre">BOOST_ITERATOR_CATEGORY</span></tt>, that expands to
-either <tt class="docutils literal"><span class="pre">iterator_category</span></tt> or <tt class="docutils literal"><span class="pre">iterator_category_</span></tt>, as
-appropriate to the platform, is provided for portability.</p>
-</div>
 </div>
 <div class="footer">
 <hr class="footer" />
--- a/doc/iterator_traits.pdf
+++ b/doc/iterator_traits.pdf
--- a/doc/iterator_traits.rst
+++ b/doc/iterator_traits.rst
@@ -75,24 +75,3 @@ Header ``<boost/iterator/iterator_traits.hpp>``::
        detail::iterator_traits<Iterator>::iterator_category
      type;
  };
-
-Broken Compiler Notes
-=====================
-
-Because of workarounds in Boost, you may find that these
-metafunctions_ actually work better than the facilities provided by
-your compiler's standard library.
-
-On compilers that don't support partial specialization, such as
-Microsoft Visual C++ 6.0 or 7.0, you may need to manually invoke
-BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION_ on the
-``value_type`` of pointers that are passed to these metafunctions.
-
-Because of bugs in the implementation of GCC-2.9x, the name of
-``iterator_category`` is changed to ``iterator_category_`` on that
-compiler.  A macro, ``BOOST_ITERATOR_CATEGORY``, that expands to
-either ``iterator_category`` or ``iterator_category_``, as
-appropriate to the platform, is provided for portability.
-
-.. _BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION: ../../type_traits/index.html#transformations
-
--- a/doc/make_counting_iterator.rst
+++ b/doc/make_counting_iterator.rst
--- a/doc/make_filter_iterator.rst
+++ b/doc/make_filter_iterator.rst
--- a/doc/make_transform_iterator.rst
+++ b/doc/make_transform_iterator.rst
--- a/doc/make_zip_iterator.rst
+++ b/doc/make_zip_iterator.rst
--- a/doc/new-iter-concepts.pdf
+++ b/doc/new-iter-concepts.pdf
--- a/doc/permutation_iterator.pdf
+++ b/doc/permutation_iterator.pdf
--- a/doc/pointee.html
+++ b/doc/pointee.html
--- a/doc/pointee.pdf
+++ b/doc/pointee.pdf
--- a/doc/pointee.rst
+++ b/doc/pointee.rst
--- a/doc/pointee_ref.rst
+++ b/doc/pointee_ref.rst
--- a/doc/quickbook/adaptor.qbk
+++ b/doc/quickbook/adaptor.qbk
@@ -132,7 +132,7 @@ above are defined as follows:

  iterator_adaptor();

-[*Requires:] The `Base` type must be Default Constructible.\n
+[*Requires:] The `Base` type must be Default Constructible.[br]
 [*Returns:] An instance of `iterator_adaptor` with 
    `m_iterator` default constructed.

@@ -206,7 +206,7 @@ we're going to pick up right where it left off.
 .. |fac_tut| replace:: `iterator_facade` tutorial
 .. _fac_tut: iterator_facade.html#tutorial-example

-[blurb [*`node_base*` really *is* an iterator]\n\n
+[blurb [*`node_base*` really *is* an iterator][br][br]
  It's not really a very interesting iterator, since `node_base`
  is an abstract class: a pointer to a `node_base` just points
  at some base subobject of an instance of some other class, and
--- a/doc/quickbook/concepts.qbk
+++ b/doc/quickbook/concepts.qbk
@@ -156,7 +156,7 @@ semantics.
  [
    [`++r`]
    [`X&`]
-    [pre:\n`r` is dereferenceable;\npost:\n`r` is dereferenceable or\n`r` is past-the-end]
+    [pre:[br]`r` is dereferenceable;[br]post:[br]`r` is dereferenceable or[br]`r` is past-the-end]
  ]
  [
    [`a == b`]
@@ -227,7 +227,7 @@ the stated semantics.
  [
    [`--r`]
    [`X&`]
-    [pre: there exists `s` such that `r == ++s`.\n post: `s` is dereferenceable. `--(++r) == r`. `--r == --s` implies `r == s`. `&r == &--r`.]
+    [pre: there exists `s` such that `r == ++s`.[br] post: `s` is dereferenceable. `--(++r) == r`. `--r == --s` implies `r == s`. `&r == &--r`.]
  ]
  [
    [`r--`]
--- a/doc/quickbook/counting_iterator.qbk
+++ b/doc/quickbook/counting_iterator.qbk
@@ -152,7 +152,7 @@ operations.

  counting_iterator();

-[*Requires: ] `Incrementable` is Default Constructible.\n
+[*Requires: ] `Incrementable` is Default Constructible.[br]
 [*Effects: ] Default construct the member `m_inc`.


@@ -174,13 +174,13 @@ operations.

  counting_iterator& operator++();

-[*Effects: ] `++m_inc`\n
+[*Effects: ] `++m_inc`[br]
 [*Returns: ] `*this`


  counting_iterator& operator--();

-[*Effects: ] `--m_inc`\n
+[*Effects: ] `--m_inc`[br]
 [*Returns: ] `*this`  


--- a/doc/quickbook/facade.qbk
+++ b/doc/quickbook/facade.qbk
@@ -68,6 +68,7 @@ requirements.
  [
    [`i.dereference()`]
    [Access the value referred to]
+  ]
  [
    [`i.equal(j)`]
    [Compare for equality with `j`]
@@ -83,6 +84,7 @@ requirements.
  [
    [`i.advance(n)`]
    [Advance by `n` positions]
+  ]
  [
    [`i.distance_to(j)`]
    [Measure the distance to `j`]
@@ -487,7 +489,8 @@ w.m)` for some temporary object `w` of type `value_type`.
              iterator_facade<Dr2,V2,TC2,R2,D2> const& rhs);

 [*Returns:]
- 
+
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -495,6 +498,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).equal((Dr1 const&)lhs)`.
+]


  template <class Dr1, class V1, class TC1, class R1, class D1,
@@ -505,6 +509,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -512,6 +517,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `!((Dr2 const&)rhs).equal((Dr1 const&)lhs)`.
+]


  template <class Dr1, class V1, class TC1, class R1, class D1,
@@ -522,6 +528,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -529,6 +536,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).distance_to((Dr1 const&)lhs) > 0`.
+]


  template <class Dr1, class V1, class TC1, class R1, class D1,
@@ -539,6 +547,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -546,6 +555,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).distance_to((Dr1 const&)lhs) >= 0`.
+]


  template <class Dr1, class V1, class TC1, class R1, class D1,
@@ -556,6 +566,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -563,6 +574,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).distance_to((Dr1 const&)lhs) < 0`.
+]


  template <class Dr1, class V1, class TC1, class R1, class D1,
@@ -573,6 +585,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -580,6 +593,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).distance_to((Dr1 const&)lhs) <= 0`.
+]

 .. _minus:

@@ -592,6 +606,7 @@ w.m)` for some temporary object `w` of type `value_type`.

 [*Return Type:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

   then 
@@ -600,9 +615,11 @@ w.m)` for some temporary object `w` of type `value_type`.

   Otherwise 
    `difference` shall be `iterator_traits<Dr2>::difference_type`
+]

 [*Returns:]
 
+[pre
  if `is_convertible<Dr2,Dr1>::value`

  then 
@@ -610,6 +627,7 @@ w.m)` for some temporary object `w` of type `value_type`.

  Otherwise, 
    `((Dr2 const&)rhs).distance_to((Dr1 const&)lhs)`.
+]


 [endsect]
--- a/doc/quickbook/facade_tutorial.qbk
+++ b/doc/quickbook/facade_tutorial.qbk
@@ -261,17 +261,17 @@ __ ../example/node_iterator1.cpp

 [h2 A constant `node_iterator`]

-[blurb *Constant and Mutable iterators*\n\n
+[blurb *Constant and Mutable iterators*[br][br]
 The term **mutable iterator** means an iterator through which
 the object it references (its "referent") can be modified.  A
 **constant iterator** is one which doesn't allow modification of
-its referent.\n\n  
+its referent.[br][br]  
 The words *constant* and *mutable* don't refer to the ability to
 modify the iterator itself.  For example, an `int const*` is a
 non-\ `const` *constant iterator*, which can be incremented
 but doesn't allow modification of its referent, and `int*
 const` is a `const` *mutable iterator*, which cannot be
-modified but which allows modification of its referent.\n\n
+modified but which allows modification of its referent.[br][br]
 Confusing?  We agree, but those are the standard terms.  It
 probably doesn't help much that a container's constant iterator
 is called `const_iterator`.
@@ -312,7 +312,7 @@ changes:
      node_base **const**\ * m_node;
  };

-[blurb `const` and an iterator's `value_type`\n\n
+[blurb `const` and an iterator's `value_type`[br][br]
 The C++ standard requires an iterator's `value_type` *not* be
 `const`\ -qualified, so `iterator_facade` strips the
 `const` from its `Value` parameter in order to produce the
--- a/doc/quickbook/filter_iterator.qbk
+++ b/doc/quickbook/filter_iterator.qbk
@@ -178,7 +178,7 @@ operations.

  filter_iterator();

-[*Requires: ]`Predicate` and `Iterator` must be Default Constructible.\n
+[*Requires: ]`Predicate` and `Iterator` must be Default Constructible.[br]
 [*Effects: ] Constructs a `filter_iterator` whose`m_pred`,  `m_iter`, and `m_end` 
  members are a default constructed.

@@ -195,7 +195,7 @@ operations.
  filter_iterator(Iterator x, Iterator end = Iterator());

 [*Requires: ] `Predicate` must be Default Constructible and
-  `Predicate` is a class type (not a function pointer).\n
+  `Predicate` is a class type (not a function pointer).[br]
 [*Effects: ] Constructs a `filter_iterator` where `m_iter` is either
    the first position in the range `[x,end)` such that `m_pred(*m_iter) == true` 
    or else`m_iter == end`. The member `m_pred` is default constructed.
@@ -205,9 +205,9 @@ operations.
    filter_iterator(
        filter_iterator<Predicate, OtherIterator> const& t
        , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0 // exposition
-        );`
+        );

-[*Requires: ] `OtherIterator` is implicitly convertible to `Iterator`.\n
+[*Requires: ] `OtherIterator` is implicitly convertible to `Iterator`.[br]
 [*Effects: ] Constructs a filter iterator whose members are copied from `t`.


@@ -235,7 +235,7 @@ operations.

 [*Effects: ] Increments `m_iter` and then continues to
  increment `m_iter` until either `m_iter == m_end`
-  or `m_pred(*m_iter) == true`.\n
+  or `m_pred(*m_iter) == true`.[br]
 [*Returns: ] `*this`  


--- a/doc/quickbook/indirect_iterator.qbk
+++ b/doc/quickbook/indirect_iterator.qbk
@@ -203,7 +203,7 @@ following operations:

  indirect_iterator();

-[*Requires: ] `Iterator` must be Default Constructible.\n
+[*Requires: ] `Iterator` must be Default Constructible.[br]
 [*Effects: ] Constructs an instance of `indirect_iterator` with 
   a default-constructed `m_iterator`.

@@ -225,7 +225,7 @@ following operations:
    , typename enable_if_convertible<Iterator2, Iterator>::type* = 0 // exposition
  );

-[*Requires: ] `Iterator2` is implicitly convertible to `Iterator`.\n
+[*Requires: ] `Iterator2` is implicitly convertible to `Iterator`.[br]
 [*Effects: ] Constructs an instance of `indirect_iterator` whose 
    `m_iterator` subobject is constructed from `y.base()`.

@@ -242,13 +242,13 @@ following operations:

  indirect_iterator& operator++();

-[*Effects: ] `++m_iterator`\n
+[*Effects: ] `++m_iterator`[br]
 [*Returns: ] `*this`


  indirect_iterator& operator--();

-[*Effects: ] `--m_iterator`\n
+[*Effects: ] `--m_iterator`[br]
 [*Returns: ] `*this`

 [endsect]
--- a/doc/quickbook/iterator.qbk
+++ b/doc/quickbook/iterator.qbk
@@ -1,6 +1,7 @@

 [library Boost.Iterator
    [/ version 1.0.1]
+    [quickbook 1.6]
    [authors [Abrahams, David], [Siek, Jeremy], [Witt, Thomas]]
    [copyright 2003 2005 David Abrahams Jeremy Siek Thomas Witt]
    [category iterator]
@@ -99,7 +100,7 @@ adaptors`_ mentioned below have been proposed for standardization

 The iterator library supplies a useful suite of standard-conforming
 iterator templates based on the Boost [link
-intro.iterator_facade_and_adaptor iterator facade and adaptor]
+iterator.intro.iterator_facade_and_adaptor iterator facade and adaptor]
 templates.

 [def _counting_    [@./counting_iterator.html         `counting_iterator`]]
--- a/doc/quickbook/permutation_iterator.qbk
+++ b/doc/quickbook/permutation_iterator.qbk
@@ -189,7 +189,7 @@ following operations.

  permutation_iterator& operator++();

-[*Effects: ] `++m_order`\n
+[*Effects: ] `++m_order`[br]
 [*Returns: ] `*this`


--- a/doc/quickbook/reverse_iterator.qbk
+++ b/doc/quickbook/reverse_iterator.qbk
@@ -115,7 +115,7 @@ operations.

  reverse_iterator();

-[*Requires: ] `Iterator` must be Default Constructible.\n
+[*Requires: ] `Iterator` must be Default Constructible.[br]
 [*Effects: ] Constructs an instance of `reverse_iterator` with `m_iterator` 
  default constructed.

@@ -131,7 +131,7 @@ operations.
      , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0 // exposition
    );

-[*Requires: ] `OtherIterator` is implicitly convertible to `Iterator`.\n
+[*Requires: ] `OtherIterator` is implicitly convertible to `Iterator`.[br]
 [*Effects: ] Constructs instance of `reverse_iterator` whose 
    `m_iterator` subobject is constructed from `y.base()`.

@@ -149,12 +149,12 @@ operations.

  reverse_iterator& operator++();

-[*Effects: ] `--m_iterator`\n
+[*Effects: ] `--m_iterator`[br]
 [*Returns: ] `*this`

  reverse_iterator& operator--();

-[*Effects: ] `++m_iterator`\n
+[*Effects: ] `++m_iterator`[br]
 [*Returns: ] `*this`

 [endsect]
--- a/doc/quickbook/traits.qbk
+++ b/doc/quickbook/traits.qbk
@@ -52,21 +52,4 @@ Header `<boost/iterator/iterator_traits.hpp>`:
      type;
  };

-[h2 Broken Compiler Notes]
-
-Because of workarounds in Boost, you may find that these
-[@../../mpl/doc/index.html#metafunctions metafunctions] actually work better than the facilities provided by
-your compiler's standard library.
-
-On compilers that don't support partial specialization, such as
-Microsoft Visual C++ 6.0 or 7.0, you may need to manually invoke
-[@../../type_traits/index.html#transformations BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION] on the
-`value_type` of pointers that are passed to these metafunctions.
-
-Because of bugs in the implementation of GCC-2.9x, the name of
-`iterator_category` is changed to `iterator_category_` on that
-compiler.  A macro, `BOOST_ITERATOR_CATEGORY`, that expands to
-either `iterator_category` or `iterator_category_`, as
-appropriate to the platform, is provided for portability.
-
-[endsect]
+[endsect]
--- a/doc/quickbook/transform_iterator.qbk
+++ b/doc/quickbook/transform_iterator.qbk
@@ -85,7 +85,7 @@ The source code for this example can be found


 If `Reference` is `use_default` then the `reference` member of
-`transform_iterator` is\n
+`transform_iterator` is[br]
 `result_of<UnaryFunction(iterator_traits<Iterator>::reference)>::type`.
 Otherwise, `reference` is `Reference`.

@@ -160,7 +160,7 @@ interoperable with `Y`.

 [h3 Operations]

-In addition to the operations required by the [link transform.concepts concepts] modeled by
+In addition to the operations required by the [link iterator.specialized.transform.concepts concepts] modeled by
 `transform_iterator`, `transform_iterator` provides the following
 operations:

@@ -183,7 +183,7 @@ operations:

 [*Returns: ] An instance of `transform_iterator` with `m_f`
  initialized to `t.functor()` and `m_iterator` initialized to
-  `t.base()`.\n
+  `t.base()`.[br]
 [*Requires: ]  `OtherIterator` is implicitly convertible to `Iterator`.


@@ -204,13 +204,13 @@ operations:

 transform_iterator& operator++();

-[*Effects: ] `++m_iterator`\n
+[*Effects: ] `++m_iterator`[br]
 [*Returns: ]  `*this`


  transform_iterator& operator--();

-[*Effects: ]  `--m_iterator`\n
+[*Effects: ]  `--m_iterator`[br]
 [*Returns: ] `*this`

 [endsect]
--- a/doc/quickbook/utilities.qbk
+++ b/doc/quickbook/utilities.qbk
@@ -49,11 +49,40 @@ proxy references or return the pointee by value.  When that
 information is needed, call on `indirect_reference`.

 Both of these templates are essential to the correct functioning of
-[link indirecct `indirect_iterator`].
+[link iterator.specialized.indirect `indirect_iterator`].
+
+[h2 `minimum_category`]
+
+`minimum_category` takes two iterator categories or two iterator traversal tags
+and returns the one that is the weakest (i.e. least advanced). For example:
+
+  static_assert(
+      is_same<
+          minimum_category<
+              std::forward_iterator_tag,
+              std::random_access_iterator_tag
+          >::type,
+          std::forward_iterator_tag
+      >::value,
+      "Unexpected minimum_category result"
+  );
+
+[h2 Iterator category and traversal tags manipulation]
+
+The library provides several utilities to simplify conversions between iterator categories
+and traversal tags:
+
+* `iterator_category_to_traversal<C>::type` - the metafunction takes an iterator category `C` and returns
+the corresponding traversal tag.
+* `iterator_traversal<T>::type` - a shorthand for `iterator_category_to_traversal<iterator_category<T>::type>::type`.
+* `pure_traversal_tag<T>::type` - the metafunction takes a tag `T` which derives from one of the iterator traversal tags
+and returns that traversal tag. `T` may also derive from other tags describing the iterator (e.g. whether this is a `const`-iterator
+or not), these additional tags are not considered.
+* `pure_iterator_traversal<T>::type` - a shorthand for `pure_traversal_tag<iterator_traversal<T>::type>::type`.

 [h2 Reference]

-[h3 `pointeee`]
+[h3 `pointee`]

  template <class Dereferenceable>
  struct pointee
@@ -74,9 +103,9 @@ Both of these templates are essential to the correct functioning of

  if ( ++x is ill-formed )
  {
-      return `Dereferenceable::element_type`
+      return Dereferenceable::element_type
  }
-  else if (`*x` is a mutable reference to
+  else if (*x is a mutable reference to
           std::iterator_traits<Dereferenceable>::value_type)
  {
      return iterator_traits<Dereferenceable>::value_type
@@ -106,10 +135,81 @@ Both of these templates are essential to the correct functioning of
 `x` is an object of type `Dereferenceable`:

  if ( ++x is ill-formed )
-      return `pointee<Dereferenceable>::type&`
+      return pointee<Dereferenceable>::type&
  else
      std::iterator_traits<Dereferenceable>::reference

+[h3 `minimum_category`]
+
+  template <typename C1, typename C2>
+  struct minimum_category
+  {
+      typedef /* see below */ type;
+  };
+
+[*Requires:] Both `C1` and `C2` shall be standard iterator categories or
+  iterator traversal tags.
+
+`type` is determined according to the following algorithm, where `c1` is an
+object of type `C1` and `c2` is an object of type `C2`:
+
+  if (c1 is convertible to c2)
+      return C2;
+  else
+      return C1;
+
+[note The above definition relies on the fact that the more restricting categories
+and traversal tags are convertible to the less restricting ones.]
+
+[h3 `iterator_category_to_traversal`]
+
+  template <typename C>
+  struct iterator_category_to_traversal
+  {
+      typedef /* see below */ type;
+  };
+
+[*Requires:] `C` shall be a standard iterator category or an
+  iterator traversal tag.
+
+If `C` is an iterator traversal tag or convertible to one, `type` equivalent to `C`.
+Otherwise, `type` is defined to the closest iterator traversal tag matching `C`.
+
+[h3 `iterator_traversal`]
+
+  template <typename Iterator>
+  struct iterator_traversal
+  {
+      typedef typename iterator_category_to_traversal<
+          typename iterator_category<Iterator>::type
+      >::type type;
+  };
+
+[*Requires:] `Iterator` shall be an iterator.
+
+[h3 `pure_traversal_tag`]
+
+  template <typename T>
+  struct pure_traversal_tag
+  {
+      typedef /* see below */ type;
+  };
+
+[*Requires:] `T` shall be convertible to an iterator traversal tag.
+
+`type` is defined to be the most advanced traversal tag `Tag` so that `T` is convertible to `Tag`.
+
+[h3 `pure_iterator_traversal`]
+
+  template <typename Iterator>
+  struct pure_iterator_traversal
+  {
+      typedef typename pure_traversal_tag<
+          typename iterator_traversal<Iterator>::type
+      >::type type;
+  };
+
+[*Requires:] `Iterator` shall be an iterator.

 [endsect]

@@ -221,4 +321,4 @@ Iterator Traversal Concepts

 [endsect]

-[endsect]
+[endsect]
--- a/doc/quickbook/zip_iterator.qbk
+++ b/doc/quickbook/zip_iterator.qbk
@@ -8,6 +8,16 @@ the zip iterator moves all the iterators in parallel.
 Dereferencing the zip iterator returns a tuple that contains
 the results of dereferencing the individual iterators. 

+The tuple of iterators is now implemented in terms of a Boost fusion sequence. 
+Because of this the 'tuple' may be any Boost fusion sequence and, for backwards
+compatibility through a Boost fusion sequence adapter, a Boost tuple. Because the 
+'tuple' may be any boost::fusion sequence the 'tuple' may also be any type for which a 
+Boost fusion adapter exists. This includes, among others, a std::tuple and a std::pair.
+Just remember to include the appropriate Boost fusion adapter header files for these
+other Boost fusion adapters. The zip_iterator header file already includes the
+Boost fusion adapter header file for Boost tuple, so you need not include it yourself
+to use a Boost tuple as your 'tuple'.
+
 [section:zip_example Example]

 There are two main types of applications of the `zip_iterator`. The first
@@ -218,7 +228,7 @@ operations.
              , IteratorTuple>::type* = 0     // exposition only
    );

-[*Returns:] An instance of `zip_iterator` that is a copy of `other`.\n
+[*Returns:] An instance of `zip_iterator` that is a copy of `other`.[br]
 [*Requires:] `OtherIteratorTuple` is implicitly convertible to `IteratorTuple`.


@@ -235,13 +245,13 @@ operations.

  zip_iterator& operator++();

-[*Effects:] Increments each iterator in `m_iterator_tuple`.\n
+[*Effects:] Increments each iterator in `m_iterator_tuple`.[br]
 [*Returns:] `*this`


  zip_iterator& operator--();

-[*Effects:] Decrements each iterator in `m_iterator_tuple`.\n
+[*Effects:] Decrements each iterator in `m_iterator_tuple`.[br]
 [*Returns:] `*this`

    template<typename IteratorTuple> 
--- a/doc/reverse_iterator.pdf
+++ b/doc/reverse_iterator.pdf
--- a/doc/transform_iterator.pdf
+++ b/doc/transform_iterator.pdf
--- a/doc/transform_iterator_eg.rst
+++ b/doc/transform_iterator_eg.rst
--- a/doc/zip_iterator.html
+++ b/doc/zip_iterator.html
--- a/doc/zip_iterator.pdf
+++ b/doc/zip_iterator.pdf
--- a/doc/zip_iterator.rst
+++ b/doc/zip_iterator.rst
--- a/doc/zip_iterator_abstract.rst
+++ b/doc/zip_iterator_abstract.rst
@@ -8,3 +8,13 @@ iterator is constructed from a tuple of iterators. Moving
 the zip iterator moves all the iterators in parallel.
 Dereferencing the zip iterator returns a tuple that contains
 the results of dereferencing the individual iterators. 
+
+The tuple of iterators is now implemented in terms of a Boost fusion sequence. 
+Because of this the 'tuple' may be any Boost fusion sequence and, for backwards
+compatibility through a Boost fusion sequence adapter, a Boost tuple. Because the 
+'tuple' may be any boost::fusion sequence the 'tuple' may also be any type for which a 
+Boost fusion adapter exists. This includes, among others, a std::tuple and a std::pair.
+Just remember to include the appropriate Boost fusion adapter header files for these
+other Boost fusion adapters. The zip_iterator header file already includes the
+Boost fusion adapter header file for Boost tuple, so you need not include it yourself
+to use a Boost tuple as your 'tuple'.
--- a/doc/zip_iterator_eg.rst
+++ b/doc/zip_iterator_eg.rst
--- a/doc/zip_iterator_ref.rst
+++ b/doc/zip_iterator_ref.rst
--- a/example/node.hpp
+++ b/example/node.hpp
--- a/example/node_iterator1.cpp
+++ b/example/node_iterator1.cpp
--- a/example/node_iterator1.hpp
+++ b/example/node_iterator1.hpp
--- a/example/node_iterator2.cpp
+++ b/example/node_iterator2.cpp
--- a/example/node_iterator2.hpp
+++ b/example/node_iterator2.hpp
--- a/example/node_iterator3.cpp
+++ b/example/node_iterator3.cpp
--- a/example/node_iterator3.hpp
+++ b/example/node_iterator3.hpp
--- a/include/boost/function_output_iterator.hpp
+++ b/include/boost/function_output_iterator.hpp
@@ -14,6 +14,7 @@
 #include <iterator>

 namespace boost {
+namespace iterators {

  template <class UnaryFunction>
  class function_output_iterator {
@@ -33,13 +34,13 @@ namespace boost {
    struct output_proxy {
      output_proxy(UnaryFunction& f) : m_f(f) { }
      template <class T> output_proxy& operator=(const T& value) {
-        m_f(value); 
-        return *this; 
+        m_f(value);
+        return *this;
      }
      UnaryFunction& m_f;
    };
    output_proxy operator*() { return output_proxy(m_f); }
-    self& operator++() { return *this; } 
+    self& operator++() { return *this; }
    self& operator++(int) { return *this; }
  private:
    UnaryFunction m_f;
@@ -51,6 +52,11 @@ namespace boost {
    return function_output_iterator<UnaryFunction>(f);
  }

+} // namespace iterators
+
+using iterators::function_output_iterator;
+using iterators::make_function_output_iterator;
+
 } // namespace boost

 #endif // BOOST_FUNCTION_OUTPUT_ITERATOR_HPP
--- a/include/boost/generator_iterator.hpp
+++ b/include/boost/generator_iterator.hpp
@@ -17,6 +17,7 @@
 #include <boost/ref.hpp>

 namespace boost {
+namespace iterators {

 template<class Generator>
 class generator_iterator
@@ -33,7 +34,7 @@ class generator_iterator
      , single_pass_traversal_tag
      , typename Generator::result_type const&
    > super_t;
-    
+
 public:
    generator_iterator() {}
    generator_iterator(Generator* g) : m_g(g), m_value((*m_g)()) {}
@@ -73,8 +74,12 @@ make_generator_iterator(Generator & gen)
  return result_t(&gen);
 }

+} // namespace iterators
+
+using iterators::generator_iterator;
+using iterators::generator_iterator_generator;
+using iterators::make_generator_iterator;
+
 } // namespace boost

-
 #endif // BOOST_ITERATOR_ADAPTOR_GENERATOR_ITERATOR_HPP
-
--- a/include/boost/indirect_reference.hpp
+++ b/include/boost/indirect_reference.hpp
@@ -17,7 +17,7 @@
 # include <boost/mpl/eval_if.hpp>
 # include <boost/pointee.hpp>

-namespace boost { 
+namespace boost {

 namespace detail
 {
@@ -37,7 +37,7 @@ struct indirect_reference
    >
 {
 };
-  
+
 } // namespace boost

 #endif // INDIRECT_REFERENCE_DWA200415_HPP
--- a/include/boost/iterator/advance.hpp
+++ b/include/boost/iterator/advance.hpp
@@ -0,0 +1,84 @@
+// Copyright (C) 2017 Michel Morin.
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_ITERATOR_ADVANCE_HPP
+#define BOOST_ITERATOR_ADVANCE_HPP
+
+#include <boost/config.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+
+namespace boost {
+namespace iterators {
+
+    namespace detail {
+        template <typename InputIterator, typename Distance>
+        inline BOOST_CXX14_CONSTEXPR void
+        advance_impl(
+            InputIterator& it
+          , Distance n
+          , incrementable_traversal_tag
+        )
+        {
+            while (n > 0) {
+                ++it;
+                --n;
+            }
+        }
+
+        template <typename BidirectionalIterator, typename Distance>
+        inline BOOST_CXX14_CONSTEXPR void
+        advance_impl(
+            BidirectionalIterator& it
+          , Distance n
+          , bidirectional_traversal_tag
+        )
+        {
+            if (n >= 0) {
+                while (n > 0) {
+                    ++it;
+                    --n;
+                }
+            }
+            else {
+                while (n < 0) {
+                    --it;
+                    ++n;
+                }
+            }
+        }
+
+        template <typename RandomAccessIterator, typename Distance>
+        inline BOOST_CXX14_CONSTEXPR void
+        advance_impl(
+            RandomAccessIterator& it
+          , Distance n
+          , random_access_traversal_tag
+        )
+        {
+            it += n;
+        }
+    }
+
+    namespace advance_adl_barrier {
+        template <typename InputIterator, typename Distance>
+        inline BOOST_CXX14_CONSTEXPR void
+        advance(InputIterator& it, Distance n)
+        {
+            detail::advance_impl(
+                it, n, typename iterator_traversal<InputIterator>::type()
+            );
+        }
+    }
+
+    using namespace advance_adl_barrier;
+
+} // namespace iterators
+
+using iterators::advance;
+
+} // namespace boost
+
+#endif
--- a/include/boost/iterator/counting_iterator.hpp
+++ b/include/boost/iterator/counting_iterator.hpp
@@ -13,6 +13,7 @@
 # include <boost/mpl/eval_if.hpp>

 namespace boost {
+namespace iterators {

 template <
    class Incrementable
@@ -30,13 +31,13 @@ namespace detail
  {
      // For a while, this wasn't true, but we rely on it below. This is a regression assert.
      BOOST_STATIC_ASSERT(::boost::is_integral<char>::value);
-      
+
 # ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-      
+
      BOOST_STATIC_CONSTANT(bool, value = std::numeric_limits<T>::is_specialized);
-      
+
 # else
-      
+
 #  if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
      BOOST_STATIC_CONSTANT(
          bool, value = (
@@ -46,20 +47,20 @@ namespace detail
 #  else
    BOOST_STATIC_CONSTANT(bool, value = ::boost::is_arithmetic<T>::value);
 #  endif
-      
+
 # endif
  };

  template <class T>
  struct is_numeric
-    : mpl::bool_<(::boost::detail::is_numeric_impl<T>::value)>
+    : mpl::bool_<(::boost::iterators::detail::is_numeric_impl<T>::value)>
  {};

 #  if defined(BOOST_HAS_LONG_LONG)
  template <>
  struct is_numeric< ::boost::long_long_type>
    : mpl::true_ {};
-  
+
  template <>
  struct is_numeric< ::boost::ulong_long_type>
    : mpl::true_ {};
@@ -69,7 +70,7 @@ namespace detail
  template <>
  struct is_numeric<wchar_t>
    : mpl::true_ {};
-  
+
  template <class T>
  struct numeric_difference
  {
@@ -77,7 +78,7 @@ namespace detail
  };

  BOOST_STATIC_ASSERT(is_numeric<int>::value);
-  
+
  template <class Incrementable, class CategoryOrTraversal, class Difference>
  struct counting_iterator_base
  {
@@ -89,7 +90,7 @@ namespace detail
            , iterator_traversal<Incrementable>
          >
      >::type traversal;
-      
+
      typedef typename detail::ia_dflt_help<
          Difference
        , mpl::eval_if<
@@ -98,7 +99,7 @@ namespace detail
            , iterator_difference<Incrementable>
          >
      >::type difference;
-      
+
      typedef iterator_adaptor<
          counting_iterator<Incrementable, CategoryOrTraversal, Difference> // self
        , Incrementable                                           // Base
@@ -106,7 +107,7 @@ namespace detail
 # ifndef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
          const  // MSVC won't strip this.  Instead we enable Thomas'
                 // criterion (see boost/iterator/detail/facade_iterator_category.hpp)
-# endif 
+# endif
        , traversal
        , Incrementable const&                                    // reference
        , difference
@@ -136,7 +137,7 @@ namespace detail
  {
      static Difference distance(Incrementable1 x, Incrementable2 y)
      {
-          return numeric_distance(x, y);
+          return boost::detail::numeric_distance(x, y);
      }
  };
 }
@@ -154,14 +155,14 @@ class counting_iterator
    typedef typename detail::counting_iterator_base<
        Incrementable, CategoryOrTraversal, Difference
    >::type super_t;
-    
+
    friend class iterator_core_access;

 public:
    typedef typename super_t::difference_type difference_type;

    counting_iterator() { }
-    
+
    counting_iterator(counting_iterator const& rhs) : super_t(rhs.base()) {}

    counting_iterator(Incrementable x)
@@ -177,10 +178,10 @@ class counting_iterator
    )
      : super_t(t.base())
    {}
-# endif 
+# endif

 private:
-    
+
    typename super_t::reference dereference() const
    {
        return this->base_reference();
@@ -209,7 +210,11 @@ make_counting_iterator(Incrementable x)
  return result_t(x);
 }

+} // namespace iterators

-} // namespace boost::iterator
+using iterators::counting_iterator;
+using iterators::make_counting_iterator;
+
+} // namespace boost

 #endif // COUNTING_ITERATOR_DWA200348_HPP
--- a/include/boost/iterator/detail/any_conversion_eater.hpp
+++ b/include/boost/iterator/detail/any_conversion_eater.hpp
@@ -4,7 +4,9 @@
 #ifndef ANY_CONVERSION_EATER_DWA20031117_HPP
 # define ANY_CONVERSION_EATER_DWA20031117_HPP

-namespace boost { namespace detail {
+namespace boost {
+namespace iterators {
+namespace detail {

 // This type can be used in traits to "eat" up the one user-defined
 // implicit conversion allowed.
@@ -14,6 +16,6 @@ struct any_conversion_eater
    any_conversion_eater(T const&);
 };

-}} // namespace boost::detail
+}}} // namespace boost::iterators::detail

 #endif // ANY_CONVERSION_EATER_DWA20031117_HPP
--- a/include/boost/iterator/detail/config_def.hpp
+++ b/include/boost/iterator/detail/config_def.hpp
@@ -46,8 +46,7 @@

 #endif

-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                                       \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x5A0))                   \
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x5A0))                      \
    || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
    || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))                \
    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
@@ -88,8 +87,7 @@
 #  define BOOST_NO_IS_CONVERTIBLE // "is_convertible doesn't work for simple types"
 #endif

-#if BOOST_WORKAROUND(__GNUC__, == 2)                                                                            \
-    || BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4) && !defined(__EDG_VERSION__)   \
+#if BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4) && !defined(__EDG_VERSION__)   \
    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
 #  define BOOST_NO_IS_CONVERTIBLE_TEMPLATE // The following program fails to compile:

@@ -116,16 +114,9 @@
 # define BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
 #endif 

-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-#  define BOOST_ARG_DEPENDENT_TYPENAME typename
-# else
-#  define BOOST_ARG_DEPENDENT_TYPENAME
-# endif
+# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))

-# if BOOST_WORKAROUND(__GNUC__, == 2) && BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(95)) \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-
-// GCC-2.95 eagerly instantiates templated constructors and conversion
+// GCC-2.95 (obsolete) eagerly instantiates templated constructors and conversion
 // operators in convertibility checks, causing premature errors.
 //
 // Borland's problems are harder to diagnose due to lack of an
--- a/include/boost/iterator/detail/config_undef.hpp
+++ b/include/boost/iterator/detail/config_undef.hpp
@@ -14,7 +14,6 @@
 #undef BOOST_NO_IS_CONVERTIBLE
 #undef BOOST_NO_IS_CONVERTIBLE_TEMPLATE
 #undef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
-#undef BOOST_ARG_DEPENDENT_TYPENAME
 #undef BOOST_NO_LVALUE_RETURN_DETECTION
 #undef BOOST_NO_ONE_WAY_ITERATOR_INTEROP

--- a/include/boost/iterator/detail/enable_if.hpp
+++ b/include/boost/iterator/detail/enable_if.hpp
@@ -35,7 +35,7 @@ namespace boost
        typedef T type;
      };
    };
-    
+
    //
    // For compilers that don't support "Substitution Failure Is Not An Error"
    // enable_if falls back to always enabled. See comments
@@ -70,11 +70,8 @@ namespace boost
      : enabled<(Cond::value)>::template base<Return>
 # else
      : mpl::identity<Return>
-# endif 
+# endif
    {
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-        typedef Return type;
-# endif 
    };

  } // namespace iterators
--- a/include/boost/iterator/detail/facade_iterator_category.hpp
+++ b/include/boost/iterator/detail/facade_iterator_category.hpp
@@ -30,10 +30,13 @@
 // iterator_category deduction for iterator_facade
 //

-// forward declaration
-namespace boost { struct use_default; }
+namespace boost {
+namespace iterators {

-namespace boost { namespace detail  {
+// forward declaration
+struct use_default;
+
+namespace detail {

 struct input_output_iterator_tag
  : std::input_iterator_tag
@@ -63,9 +66,9 @@ struct iterator_writability_disabled
      , boost::detail::indirect_traits::is_reference_to_const<Reference>
      , is_const<ValueParam>
    >
-# else 
+# else
  : is_const<ValueParam>
-# endif 
+# endif
 {};


@@ -96,7 +99,7 @@ struct iterator_facade_default_category
      , typename mpl::eval_if<
            mpl::and_<
                is_convertible<Traversal, single_pass_traversal_tag>
-                
+
                // check for readability
              , is_convertible<Reference, ValueParam>
            >
@@ -132,7 +135,6 @@ template <class Category, class Traversal>
 struct iterator_category_with_traversal
  : Category, Traversal
 {
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
    // Make sure this isn't used to build any categories where
    // convertibility to Traversal is redundant.  Should just use the
    // Category element in that case.
@@ -147,8 +149,7 @@ struct iterator_category_with_traversal
    BOOST_MPL_ASSERT_NOT((is_iterator_traversal<Category>));
 #  if !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
    BOOST_MPL_ASSERT((is_iterator_traversal<Traversal>));
-#  endif 
-# endif 
+#  endif
 };

 // Computes an iterator_category tag whose traversal is Traversal and
@@ -156,14 +157,12 @@ struct iterator_category_with_traversal
 template <class Traversal, class ValueParam, class Reference>
 struct facade_iterator_category_impl
 {
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
    BOOST_MPL_ASSERT_NOT((is_iterator_category<Traversal>));
-# endif 
-    
+
    typedef typename iterator_facade_default_category<
        Traversal,ValueParam,Reference
    >::type category;
-    
+
    typedef typename mpl::if_<
        is_same<
            Traversal
@@ -187,7 +186,7 @@ struct facade_iterator_category
 {
 };

-}} // namespace boost::detail
+}}} // namespace boost::iterators::detail

 # include <boost/iterator/detail/config_undef.hpp>

--- a/include/boost/iterator/detail/minimum_category.hpp
+++ b/include/boost/iterator/detail/minimum_category.hpp
@@ -4,113 +4,16 @@
 #ifndef MINIMUM_CATEGORY_DWA20031119_HPP
 # define MINIMUM_CATEGORY_DWA20031119_HPP

-# include <boost/type_traits/is_convertible.hpp>
-# include <boost/type_traits/is_same.hpp>
+# include <boost/iterator/minimum_category.hpp>

-# include <boost/mpl/aux_/lambda_support.hpp>
+namespace boost {

-namespace boost { namespace detail { 
-//
-// Returns the minimum category type or error_type
-// if T1 and T2 are unrelated.
-//
-// For compilers not supporting is_convertible this only
-// works with the new boost return and traversal category
-// types. The exact boost _types_ are required. No derived types
-// will work. 
-//
-//
-template <bool GreaterEqual, bool LessEqual>
-struct minimum_category_impl
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-{
-    template <class T1, class T2> struct apply
-    {
-        typedef T2 type;
-    };
-    typedef void type;
-}
-# endif 
-;
+// This import below (as well as the whole header) is for backward compatibility
+// with boost/token_iterator.hpp. It should be removed as soon as that header is fixed.
+namespace detail {
+using iterators::minimum_category;
+} // namespace detail

-template <class T1, class T2>
-struct error_not_related_by_convertibility;
-  
-template <>
-struct minimum_category_impl<true,false>
-{
-    template <class T1, class T2> struct apply
-    {
-        typedef T2 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<false,true>
-{
-    template <class T1, class T2> struct apply
-    {
-        typedef T1 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<true,true>
-{
-    template <class T1, class T2> struct apply
-    {
-        BOOST_STATIC_ASSERT((is_same<T1,T2>::value));
-        typedef T1 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<false,false>
-{
-    template <class T1, class T2> struct apply
-    : error_not_related_by_convertibility<T1,T2>
-    {
-    };
-};
-
-template <class T1 = mpl::_1, class T2 = mpl::_2>
-struct minimum_category
-{
-    typedef minimum_category_impl< 
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround
-        is_same<T2,int>::value ||
-# endif 
-        ::boost::is_convertible<T1,T2>::value
-      , ::boost::is_convertible<T2,T1>::value
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround
-        || is_same<T1,int>::value
-# endif 
-    > outer;
-
-    typedef typename outer::template apply<T1,T2> inner;
-    typedef typename inner::type type;
-      
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(2,minimum_category,(T1,T2))
-};
-    
-template <>
-struct minimum_category<mpl::_1,mpl::_2>
-{
-    template <class T1, class T2>
-    struct apply : minimum_category<T1,T2>
-    {};
-
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(2,minimum_category,(mpl::_1,mpl::_2))
-};
-
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround
-template <>
-struct minimum_category<int,int>
-{
-    typedef int type;
-};
-# endif
-    
-}} // namespace boost::detail
+} // namespace boost

 #endif // MINIMUM_CATEGORY_DWA20031119_HPP
--- a/include/boost/iterator/detail/operator_brackets_dispatch.hpp
+++ b/include/boost/iterator/detail/operator_brackets_dispatch.hpp
@@ -1,88 +0,0 @@
-// (C) Copyright David Abrahams 2002.
-// (C) Copyright Jeremy Siek    2002.
-// (C) Copyright Thomas Witt    2002.
-// (C) Copyright Jeffrey Lee Hellrung, Jr. 2012.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_OPERATOR_BRACKETS_DISPATCH_07102012JLH_HPP
-#define BOOST_OPERATOR_BRACKETS_DISPATCH_07102012JLH_HPP
-
-#include <boost/iterator/detail/facade_iterator_category.hpp>
-
-#include <boost/type_traits/is_pod.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
-#include <boost/mpl/if.hpp>
-
-namespace boost { namespace detail {
-
-// operator[] must return a proxy in case iterator destruction invalidates
-// referents.
-// To see why, consider the following implementation of operator[]:
-//   reference operator[](difference_type n) const
-//   { return *(*this + n); }
-// The problem here is that operator[] would return a reference created from
-// a temporary iterator.
-
-template <class Value>
-struct operator_brackets_value
-{
-    typedef Value result_type;
-    template <class Iterator>
-    static result_type apply(Iterator const & i)
-    { return *i; }
-};
-
-template <class Iterator, class Reference>
-struct operator_brackets_const_proxy
-{
-    class result_type
-    {
-        Iterator const m_i;
-        explicit result_type(Iterator const & i) : m_i(i) { }
-        friend struct operator_brackets_const_proxy;
-        void operator=(result_type&);
-    public:
-        operator Reference() const { return *m_i; }
-    };
-    static result_type apply(Iterator const & i)
-    { return result_type(i); }
-};
-
-template <class Iterator, class Reference>
-struct operator_brackets_proxy
-{
-    class result_type
-    {
-        Iterator const m_i;
-        explicit result_type(Iterator const & i) : m_i(i) { }
-        friend struct operator_brackets_proxy;
-        void operator=(result_type&);
-    public:
-        operator Reference() const { return *m_i; }
-        operator_brackets_proxy const & operator=(
-          typename Iterator::value_type const & x) const
-        { *m_i = x; return *this; }
-    };
-    static result_type apply(Iterator const & i)
-    { return result_type(i); }
-};
-
-template <class Iterator, class ValueType, class Reference>
-struct operator_brackets_dispatch
-{
-    typedef typename mpl::if_c<
-        iterator_writability_disabled<ValueType,Reference>::value,
-        typename mpl::if_c<
-            boost::is_POD<ValueType>::value,
-            operator_brackets_value<typename boost::remove_const<ValueType>::type>,
-            operator_brackets_const_proxy<Iterator,Reference>
-        >::type,
-        operator_brackets_proxy<Iterator,Reference>
-    >::type type;
-};
-
-} } // namespace detail / namespace boost
-
-#endif // #ifndef BOOST_OPERATOR_BRACKETS_DISPATCH_07102012JLH_HPP
--- a/include/boost/iterator/distance.hpp
+++ b/include/boost/iterator/distance.hpp
@@ -0,0 +1,65 @@
+// Copyright (C) 2017 Michel Morin.
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_ITERATOR_DISTANCE_HPP
+#define BOOST_ITERATOR_DISTANCE_HPP
+
+#include <boost/config.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+#include <boost/iterator/iterator_traits.hpp>
+
+namespace boost {
+namespace iterators {
+
+    namespace detail {
+        template <typename SinglePassIterator>
+        inline BOOST_CXX14_CONSTEXPR typename iterator_difference<SinglePassIterator>::type
+        distance_impl(
+            SinglePassIterator first
+          , SinglePassIterator last
+          , single_pass_traversal_tag
+        )
+        {
+            typename iterator_difference<SinglePassIterator>::type n = 0;
+            while (first != last) {
+                ++first;
+                ++n;
+            }
+            return n;
+        }
+
+        template <typename RandomAccessIterator>
+        inline BOOST_CXX14_CONSTEXPR typename iterator_difference<RandomAccessIterator>::type
+        distance_impl(
+            RandomAccessIterator first
+          , RandomAccessIterator last
+          , random_access_traversal_tag
+        )
+        {
+            return last - first;
+        }
+    }
+
+    namespace distance_adl_barrier {
+        template <typename SinglePassIterator>
+        inline BOOST_CXX14_CONSTEXPR typename iterator_difference<SinglePassIterator>::type
+        distance(SinglePassIterator first, SinglePassIterator last)
+        {
+            return detail::distance_impl(
+                first, last, typename iterator_traversal<SinglePassIterator>::type()
+            );
+        }
+    }
+
+    using namespace distance_adl_barrier;
+
+} // namespace iterators
+
+using iterators::distance;
+
+} // namespace boost
+
+#endif
--- a/include/boost/iterator/filter_iterator.hpp
+++ b/include/boost/iterator/filter_iterator.hpp
@@ -14,8 +14,9 @@
 #include <boost/type_traits/is_class.hpp>
 #include <boost/static_assert.hpp>

-namespace boost
-{
+namespace boost {
+namespace iterators {
+
  template <class Predicate, class Iterator>
  class filter_iterator;

@@ -39,7 +40,7 @@ namespace boost
        > type;
    };
  }
-  
+
  template <class Predicate, class Iterator>
  class filter_iterator
    : public detail::filter_iterator_base<Predicate, Iterator>::type
@@ -68,7 +69,7 @@ namespace boost
          // Don't allow use of this constructor if Predicate is a
          // function pointer type, since it will be 0.
          BOOST_STATIC_ASSERT(is_class<Predicate>::value);
-#endif 
+#endif
          satisfy_predicate();
      }

@@ -108,28 +109,29 @@ namespace boost
  };

  template <class Predicate, class Iterator>
-  filter_iterator<Predicate,Iterator>
+  inline filter_iterator<Predicate,Iterator>
  make_filter_iterator(Predicate f, Iterator x, Iterator end = Iterator())
  {
      return filter_iterator<Predicate,Iterator>(f,x,end);
  }

  template <class Predicate, class Iterator>
-  filter_iterator<Predicate,Iterator>
+  inline filter_iterator<Predicate,Iterator>
  make_filter_iterator(
      typename iterators::enable_if<
          is_class<Predicate>
        , Iterator
      >::type x
-    , Iterator end = Iterator()
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-    , Predicate* = 0
-#endif 
-  )
+    , Iterator end = Iterator())
  {
      return filter_iterator<Predicate,Iterator>(x,end);
  }

+} // namespace iterators
+
+using iterators::filter_iterator;
+using iterators::make_filter_iterator;
+
 } // namespace boost

 #endif // BOOST_FILTER_ITERATOR_23022003THW_HPP
--- a/include/boost/iterator/function_input_iterator.hpp
+++ b/include/boost/iterator/function_input_iterator.hpp
@@ -9,6 +9,7 @@
 #ifndef BOOST_FUNCTION_INPUT_ITERATOR
 #define BOOST_FUNCTION_INPUT_ITERATOR

+#include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/function_types/is_function_pointer.hpp>
@@ -17,23 +18,26 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/none.hpp>
 #include <boost/optional/optional.hpp>
+#include <boost/utility/result_of.hpp>

 namespace boost {

+namespace iterators {
+
    namespace impl {

        template <class Function, class Input>
        class function_input_iterator
            : public iterator_facade<
            function_input_iterator<Function, Input>,
-            typename Function::result_type,
+            BOOST_DEDUCED_TYPENAME result_of<Function ()>::type,
            single_pass_traversal_tag,
-            typename Function::result_type const &
+            BOOST_DEDUCED_TYPENAME result_of<Function ()>::type const &
            >
        {
        public:
            function_input_iterator() {}
-            function_input_iterator(Function & f_, Input state_ = Input()) 
+            function_input_iterator(Function & f_, Input state_ = Input())
                : f(&f_), state(state_) {}

            void increment() {
@@ -44,7 +48,7 @@ namespace boost {
                ++state;
            }

-            typename Function::result_type const & 
+            BOOST_DEDUCED_TYPENAME result_of<Function ()>::type const &
                dereference() const {
                    return (value ? value : value = (*f)()).get();
            }
@@ -56,7 +60,7 @@ namespace boost {
        private:
            Function * f;
            Input state;
-            mutable optional<typename Function::result_type> value;
+            mutable optional<BOOST_DEDUCED_TYPENAME result_of<Function ()>::type> value;
        };

        template <class Function, class Input>
@@ -109,7 +113,7 @@ namespace boost {
    } // namespace impl

    template <class Function, class Input>
-    class function_input_iterator 
+    class function_input_iterator
        : public mpl::if_<
            function_types::is_function_pointer<Function>,
            impl::function_pointer_input_iterator<Function,Input>,
@@ -154,7 +158,14 @@ namespace boost {
        bool operator==(infinite &) const { return false; };
        bool operator==(infinite const &) const { return false; };
    };
-}
+
+} // namespace iterators
+
+using iterators::function_input_iterator;
+using iterators::make_function_input_iterator;
+using iterators::infinite;
+
+} // namespace boost

 #endif

--- a/include/boost/iterator/indirect_iterator.hpp
+++ b/include/boost/iterator/indirect_iterator.hpp
@@ -30,12 +30,13 @@
 # include <boost/scoped_ptr.hpp>
 # include <boost/mpl/bool.hpp>
 # include <memory>
-#endif 
+#endif

 #include <boost/iterator/detail/config_def.hpp> // must be last #include

-namespace boost
-{
+namespace boost {
+namespace iterators {
+
  template <class Iter, class Value, class Category, class Reference, class Difference>
  class indirect_iterator;

@@ -44,8 +45,8 @@ namespace boost
    template <class Iter, class Value, class Category, class Reference, class Difference>
    struct indirect_base
    {
-        typedef typename iterator_traits<Iter>::value_type dereferenceable;
-        
+        typedef typename boost::detail::iterator_traits<Iter>::value_type dereferenceable;
+
        typedef iterator_adaptor<
            indirect_iterator<Iter, Value, Category, Reference, Difference>
          , Iter
@@ -69,7 +70,7 @@ namespace boost
    struct indirect_base<int, int, int, int, int> {};
  } // namespace detail

-    
+
  template <
      class Iterator
    , class Value = use_default
@@ -107,14 +108,14 @@ namespace boost
        : super_t(y.base())
      {}

-  private:    
+  private:
      typename super_t::reference dereference() const
      {
 # if BOOST_WORKAROUND(__BORLANDC__, < 0x5A0 )
          return const_cast<super_t::reference>(**this->base());
 # else
          return **this->base();
-# endif 
+# endif
      }
  };

@@ -132,6 +133,11 @@ namespace boost
    return indirect_iterator<Iter, Traits>(x);
  }

+} // namespace iterators
+
+using iterators::indirect_iterator;
+using iterators::make_indirect_iterator;
+
 } // namespace boost

 #include <boost/iterator/detail/config_undef.hpp>
--- a/include/boost/iterator/interoperable.hpp
+++ b/include/boost/iterator/interoperable.hpp
@@ -14,8 +14,8 @@

 # include <boost/iterator/detail/config_def.hpp> // must appear last

-namespace boost
-{
+namespace boost {
+namespace iterators {

  //
  // Meta function that determines whether two
@@ -27,7 +27,7 @@ namespace boost
  // standards requirements on constant/mutable container
  // iterators (23.1 [lib.container.requirements]).
  //
-  // For compilers that don't support is_convertible 
+  // For compilers that don't support is_convertible
  // is_interoperable gives false positives. See comments
  // on operator implementation for consequences.
  //
@@ -40,9 +40,13 @@ namespace boost
          is_convertible< A, B >
        , is_convertible< B, A > >
 # endif
-  { 
+  {
  };

+} // namespace iterators
+
+using iterators::is_interoperable;
+
 } // namespace boost

 # include <boost/iterator/detail/config_undef.hpp>
--- a/include/boost/iterator/is_lvalue_iterator.hpp
+++ b/include/boost/iterator/is_lvalue_iterator.hpp
@@ -9,16 +9,21 @@
 #include <boost/detail/workaround.hpp>
 #include <boost/detail/iterator.hpp>

+#include <boost/type_traits/add_lvalue_reference.hpp>
 #include <boost/iterator/detail/any_conversion_eater.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/aux_/lambda_support.hpp>

 // should be the last #includes
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <boost/type_traits/integral_constant.hpp>
 #include <boost/iterator/detail/config_def.hpp>

 #ifndef BOOST_NO_IS_CONVERTIBLE

 namespace boost {
- 
+
+namespace iterators {
+
 namespace detail
 {
 #ifndef BOOST_NO_LVALUE_RETURN_DETECTION
@@ -26,20 +31,20 @@ namespace detail
  // to the expression's result if <expression> is an lvalue, or
  // not_an_lvalue() otherwise.
  struct not_an_lvalue {};
-  
+
  template <class T>
  T& lvalue_preserver(T&, int);
-  
+
  template <class U>
  not_an_lvalue lvalue_preserver(U const&, ...);
-  
+
 # define BOOST_LVALUE_PRESERVER(expr) detail::lvalue_preserver(expr,0)
-  
+
 #else
-  
+
 # define BOOST_LVALUE_PRESERVER(expr) expr
-  
-#endif 
+
+#endif

  // Guts of is_lvalue_iterator.  Value is the iterator's value_type
  // and the result is computed in the nested rebind template.
@@ -50,17 +55,17 @@ namespace detail
      // convertible to Value const&
      struct conversion_eater
      {
-          conversion_eater(Value&);
+          conversion_eater(typename add_lvalue_reference<Value>::type);
      };

      static char tester(conversion_eater, int);
      static char (& tester(any_conversion_eater, ...) )[2];
-    
+
      template <class It>
      struct rebind
      {
          static It& x;
-          
+
          BOOST_STATIC_CONSTANT(
              bool
            , value = (
@@ -75,7 +80,7 @@ namespace detail
  };

 #undef BOOST_LVALUE_PRESERVER
-  
+
  //
  // void specializations to handle std input and output iterators
  //
@@ -132,19 +137,29 @@ namespace detail
  {};
 } // namespace detail

-// Define the trait with full mpl lambda capability and various broken
-// compiler workarounds
-BOOST_TT_AUX_BOOL_TRAIT_DEF1(
-    is_lvalue_iterator,T,::boost::detail::is_readable_lvalue_iterator_impl<T>::value)
-    
-BOOST_TT_AUX_BOOL_TRAIT_DEF1(
-    is_non_const_lvalue_iterator,T,::boost::detail::is_non_const_lvalue_iterator_impl<T>::value)
-    
+template< typename T > struct is_lvalue_iterator
+: public ::boost::integral_constant<bool,::boost::iterators::detail::is_readable_lvalue_iterator_impl<T>::value>
+{
+public:
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_lvalue_iterator,(T))
+};
+
+template< typename T > struct is_non_const_lvalue_iterator
+: public ::boost::integral_constant<bool,::boost::iterators::detail::is_non_const_lvalue_iterator_impl<T>::value>
+{
+public:
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_non_const_lvalue_iterator,(T))
+};
+
+} // namespace iterators
+
+using iterators::is_lvalue_iterator;
+using iterators::is_non_const_lvalue_iterator;
+
 } // namespace boost

 #endif

 #include <boost/iterator/detail/config_undef.hpp>
-#include <boost/type_traits/detail/bool_trait_undef.hpp>

 #endif // IS_LVALUE_ITERATOR_DWA2003112_HPP
--- a/include/boost/iterator/is_readable_iterator.hpp
+++ b/include/boost/iterator/is_readable_iterator.hpp
@@ -5,18 +5,22 @@
 # define IS_READABLE_ITERATOR_DWA2003112_HPP

 #include <boost/mpl/bool.hpp>
+#include <boost/mpl/aux_/lambda_support.hpp>
 #include <boost/detail/iterator.hpp>
+#include <boost/type_traits/add_lvalue_reference.hpp>

-#include <boost/type_traits/detail/bool_trait_def.hpp>
 #include <boost/iterator/detail/any_conversion_eater.hpp>

 // should be the last #include
+#include <boost/type_traits/integral_constant.hpp>
 #include <boost/iterator/detail/config_def.hpp>

 #ifndef BOOST_NO_IS_CONVERTIBLE

 namespace boost {
- 
+
+namespace iterators {
+
 namespace detail
 {
  // Guts of is_readable_iterator.  Value is the iterator's value_type
@@ -24,14 +28,14 @@ namespace detail
  template <class Value>
  struct is_readable_iterator_impl
  {
-      static char tester(Value&, int);
+      static char tester(typename add_lvalue_reference<Value>::type, int);
      static char (& tester(any_conversion_eater, ...) )[2];
-    
+
      template <class It>
      struct rebind
      {
          static It& x;
-          
+
          BOOST_STATIC_CONSTANT(
              bool
            , value = (
@@ -44,7 +48,7 @@ namespace detail
  };

 #undef BOOST_READABLE_PRESERVER
-  
+
  //
  // void specializations to handle std input and output iterators
  //
@@ -94,11 +98,17 @@ namespace detail
  {};
 } // namespace detail

-// Define the trait with full mpl lambda capability and various broken
-// compiler workarounds
-BOOST_TT_AUX_BOOL_TRAIT_DEF1(
-    is_readable_iterator,T,::boost::detail::is_readable_iterator_impl2<T>::value)
-    
+template< typename T > struct is_readable_iterator
+: public ::boost::integral_constant<bool,::boost::iterators::detail::is_readable_iterator_impl2<T>::value>
+{
+public:
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_readable_iterator,(T))
+};
+
+} // namespace iterators
+
+using iterators::is_readable_iterator;
+
 } // namespace boost

 #endif
--- a/include/boost/iterator/iterator_adaptor.hpp
+++ b/include/boost/iterator/iterator_adaptor.hpp
@@ -31,28 +31,33 @@

 #include <boost/iterator/iterator_traits.hpp>

-namespace boost
-{
+namespace boost {
+namespace iterators {
+
  // Used as a default template argument internally, merely to
  // indicate "use the default", this can also be passed by users
  // explicitly in order to specify that the default should be used.
  struct use_default;
-  
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  // the incompleteness of use_default causes massive problems for
-  // is_convertible (naturally).  This workaround is fortunately not
-  // needed for vc6/vc7.
-  template<class To>
-  struct is_convertible<use_default,To>
-    : mpl::false_ {};
-# endif 
-  
+
+} // namespace iterators
+
+using iterators::use_default;
+
+// the incompleteness of use_default causes massive problems for
+// is_convertible (naturally).  This workaround is fortunately not
+// needed for vc6/vc7.
+template<class To>
+struct is_convertible<use_default,To>
+  : mpl::false_ {};
+
+namespace iterators {
+
  namespace detail
  {

-    // 
+    //
    // Result type used in enable_if_convertible meta function.
-    // This can be an incomplete type, as only pointers to 
+    // This can be an incomplete type, as only pointers to
    // enable_if_convertible< ... >::type are used.
    // We could have used void for this, but conversion to
    // void* is just to easy.
@@ -73,7 +78,7 @@ namespace boost
  //   public iterator_adaptor< adapted_iterator<Iterator>, Iterator >
  // {
  // public:
-  //   
+  //
  //   ...
  //
  //   template <class OtherIterator>
@@ -92,38 +97,23 @@ namespace boost
  // and not at the actual instantiation.
  //
  // enable_if_interoperable can be safely used in user code. It falls back to
-  // always enabled for compilers that don't support enable_if or is_convertible. 
-  // There is no need for compiler specific workarounds in user code. 
+  // always enabled for compilers that don't support enable_if or is_convertible.
+  // There is no need for compiler specific workarounds in user code.
  //
  // The operators implementation relies on boost::is_convertible not returning
  // false positives for user/library defined iterator types. See comments
  // on operator implementation for consequences.
  //
-#  if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-  
-  template<typename From, typename To>
-  struct enable_if_convertible
-  {
-     typedef typename mpl::if_<
-         mpl::or_<
-             is_same<From,To>
-           , is_convertible<From, To>
-         >
-      , boost::detail::enable_type
-      , int&
-     >::type type;
-  };
-  
-#  elif defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_SFINAE)
-  
+#  if defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_SFINAE)
+
  template <class From, class To>
  struct enable_if_convertible
  {
-      typedef boost::detail::enable_type type;
+      typedef boost::iterators::detail::enable_type type;
  };
-  
-#  elif BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292)) && BOOST_MSVC > 1300
-  
+
+#  elif BOOST_WORKAROUND(_MSC_FULL_VER, BOOST_TESTED_AT(13102292))
+
  // For some reason vc7.1 needs us to "cut off" instantiation
  // of is_convertible in a few cases.
  template<typename From, typename To>
@@ -133,22 +123,22 @@ namespace boost
            is_same<From,To>
          , is_convertible<From, To>
        >
-      , boost::detail::enable_type
+      , boost::iterators::detail::enable_type
    >
  {};
-  
-#  else 
-  
+
+#  else
+
  template<typename From, typename To>
  struct enable_if_convertible
    : iterators::enable_if<
          is_convertible<From, To>
-        , boost::detail::enable_type
+        , boost::iterators::detail::enable_type
      >
  {};
-      
+
 # endif
-  
+
  //
  // Default template argument handling for iterator_adaptor
  //
@@ -180,9 +170,9 @@ namespace boost
    {
        typedef iterator_facade<
            Derived
-            
+
 # ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
-          , typename boost::detail::ia_dflt_help<
+          , typename boost::iterators::detail::ia_dflt_help<
                Value
              , mpl::eval_if<
                    is_same<Reference,use_default>
@@ -191,17 +181,17 @@ namespace boost
                >
            >::type
 # else
-          , typename boost::detail::ia_dflt_help<
+          , typename boost::iterators::detail::ia_dflt_help<
                Value, iterator_value<Base>
            >::type
 # endif
-            
-          , typename boost::detail::ia_dflt_help<
+
+          , typename boost::iterators::detail::ia_dflt_help<
                Traversal
              , iterator_traversal<Base>
            >::type

-          , typename boost::detail::ia_dflt_help<
+          , typename boost::iterators::detail::ia_dflt_help<
                Reference
              , mpl::eval_if<
                    is_same<Value,use_default>
@@ -210,13 +200,13 @@ namespace boost
                >
            >::type

-          , typename boost::detail::ia_dflt_help<
+          , typename boost::iterators::detail::ia_dflt_help<
                Difference, iterator_difference<Base>
            >::type
        >
        type;
    };
-  
+
    // workaround for aC++ CR JAGaf33512
    template <class Tr1, class Tr2>
    inline void iterator_adaptor_assert_traversal ()
@@ -224,7 +214,7 @@ namespace boost
      BOOST_STATIC_ASSERT((is_convertible<Tr1, Tr2>::value));
    }
  }
-  
+
  //
  // Iterator Adaptor
  //
@@ -259,14 +249,14 @@ namespace boost
    , class Difference   = use_default
  >
  class iterator_adaptor
-    : public boost::detail::iterator_adaptor_base<
+    : public boost::iterators::detail::iterator_adaptor_base<
        Derived, Base, Value, Traversal, Reference, Difference
      >::type
  {
      friend class iterator_core_access;

   protected:
-      typedef typename boost::detail::iterator_adaptor_base<
+      typedef typename boost::iterators::detail::iterator_adaptor_base<
          Derived, Base, Value, Traversal, Reference, Difference
      >::type super_t;
   public:
@@ -285,7 +275,7 @@ namespace boost
   protected:
      // for convenience in derived classes
      typedef iterator_adaptor<Derived,Base,Value,Traversal,Reference,Difference> iterator_adaptor_;
-      
+
      //
      // lvalue access to the Base object for Derived
      //
@@ -301,13 +291,13 @@ namespace boost
      // to prevent temptation for Derived classes to use it, which
      // will often result in an error.  Derived classes should use
      // base_reference(), above, to get direct access to m_iterator.
-      // 
+      //
      typename super_t::reference dereference() const
        { return *m_iterator; }

      template <
      class OtherDerived, class OtherIterator, class V, class C, class R, class D
-      >   
+      >
      bool equal(iterator_adaptor<OtherDerived, OtherIterator, V, C, R, D> const& x) const
      {
        // Maybe readd with same_distance
@@ -322,17 +312,17 @@ namespace boost
      >::type my_traversal;

 # define BOOST_ITERATOR_ADAPTOR_ASSERT_TRAVERSAL(cat) \
-      boost::detail::iterator_adaptor_assert_traversal<my_traversal, cat>();
+      boost::iterators::detail::iterator_adaptor_assert_traversal<my_traversal, cat>();

      void advance(typename super_t::difference_type n)
      {
          BOOST_ITERATOR_ADAPTOR_ASSERT_TRAVERSAL(random_access_traversal_tag)
          m_iterator += n;
      }
-  
+
      void increment() { ++m_iterator; }

-      void decrement() 
+      void decrement()
      {
          BOOST_ITERATOR_ADAPTOR_ASSERT_TRAVERSAL(bidirectional_traversal_tag)
           --m_iterator;
@@ -340,7 +330,7 @@ namespace boost

      template <
          class OtherDerived, class OtherIterator, class V, class C, class R, class D
-      >   
+      >
      typename super_t::difference_type distance_to(
          iterator_adaptor<OtherDerived, OtherIterator, V, C, R, D> const& y) const
      {
@@ -353,11 +343,16 @@ namespace boost
      }

 # undef BOOST_ITERATOR_ADAPTOR_ASSERT_TRAVERSAL
-      
+
   private: // data members
      Base m_iterator;
  };

+} // namespace iterators
+
+using iterators::iterator_adaptor;
+using iterators::enable_if_convertible;
+
 } // namespace boost

 #include <boost/iterator/detail/config_undef.hpp>
--- a/include/boost/iterator/iterator_archetypes.hpp
+++ b/include/boost/iterator/iterator_archetypes.hpp
@@ -20,7 +20,6 @@

 #include <boost/concept_archetype.hpp>

-#include <boost/mpl/aux_/msvc_eti_base.hpp>
 #include <boost/mpl/bitand.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/equal_to.hpp>
@@ -32,6 +31,7 @@
 #include <cstddef>

 namespace boost {
+namespace iterators {

 template <class Value, class AccessCategory>
 struct access_archetype;
@@ -39,7 +39,7 @@ struct access_archetype;
 template <class Derived, class Value, class AccessCategory, class TraversalCategory>
 struct traversal_archetype;

-namespace iterator_archetypes
+namespace archetypes
 {
  enum {
      readable_iterator_bit = 1
@@ -51,19 +51,19 @@ namespace iterator_archetypes
  // Not quite tags, since dispatching wouldn't work.
  typedef mpl::int_<readable_iterator_bit>::type readable_iterator_t;
  typedef mpl::int_<writable_iterator_bit>::type writable_iterator_t;
-  
+
  typedef mpl::int_<
      (readable_iterator_bit|writable_iterator_bit)
          >::type readable_writable_iterator_t;
-  
+
  typedef mpl::int_<
      (readable_iterator_bit|lvalue_iterator_bit)
          >::type readable_lvalue_iterator_t;
-  
+
  typedef mpl::int_<
      (lvalue_iterator_bit|writable_iterator_bit)
          >::type writable_lvalue_iterator_t;
-  
+
  typedef mpl::int_<swappable_iterator_bit>::type swappable_iterator_t;
  typedef mpl::int_<lvalue_iterator_bit>::type lvalue_iterator_t;

@@ -119,29 +119,27 @@ namespace detail

  template <class Value, class AccessCategory, class TraversalCategory>
  struct operator_brackets
-    : mpl::aux::msvc_eti_base<
-          typename mpl::eval_if<
-              is_convertible<TraversalCategory, random_access_traversal_tag>
-            , mpl::eval_if<
-                  iterator_archetypes::has_access<
-                      AccessCategory
-                    , iterator_archetypes::writable_iterator_t
-                  >
-                , mpl::identity<writable_operator_brackets<Value> >
-                , mpl::if_<
-                      iterator_archetypes::has_access<
-                          AccessCategory
-                        , iterator_archetypes::readable_iterator_t
-                      >
-                    , readable_operator_brackets<Value>
-                    , no_operator_brackets
-                  >
+    : mpl::eval_if<
+          is_convertible<TraversalCategory, random_access_traversal_tag>
+        , mpl::eval_if<
+              archetypes::has_access<
+                  AccessCategory
+                , archetypes::writable_iterator_t
              >
-            , mpl::identity<no_operator_brackets>
-          >::type
+            , mpl::identity<writable_operator_brackets<Value> >
+            , mpl::if_<
+                  archetypes::has_access<
+                      AccessCategory
+                    , archetypes::readable_iterator_t
+                  >
+                , readable_operator_brackets<Value>
+                , no_operator_brackets
+              >
+          >
+        , mpl::identity<no_operator_brackets>
      >::type
  {};
-  
+
  template <class TraversalCategory>
  struct traversal_archetype_impl
  {
@@ -154,18 +152,16 @@ namespace detail

  template <class Derived, class Value, class TraversalCategory>
  struct traversal_archetype_
-    : mpl::aux::msvc_eti_base<
-          typename traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
-      >::type
+    : traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
  {
      typedef typename
        traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
      base;
-      
+
      traversal_archetype_() {}

      traversal_archetype_(ctor_arg arg)
-        : base(arg) 
+        : base(arg)
      {}
  };

@@ -196,7 +192,7 @@ namespace detail
          explicit archetype(ctor_arg arg)
            : traversal_archetype_<Derived, Value, incrementable_traversal_tag>(arg)
          {}
-          
+
          typedef std::ptrdiff_t difference_type;
      };
  };
@@ -204,13 +200,7 @@ namespace detail
  template <class Derived, class Value>
  bool operator==(traversal_archetype_<Derived, Value, single_pass_traversal_tag> const&,
                  traversal_archetype_<Derived, Value, single_pass_traversal_tag> const&) { return true; }
-  
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-  // doesn't seem to pick up != from equality_comparable
-  template <class Derived, class Value>
-  bool operator!=(traversal_archetype_<Derived, Value, single_pass_traversal_tag> const&,
-                  traversal_archetype_<Derived, Value, single_pass_traversal_tag> const&) { return true; }
-#endif 
+
  template <>
  struct traversal_archetype_impl<forward_traversal_tag>
  {
@@ -218,7 +208,7 @@ namespace detail
      struct archetype
        : public traversal_archetype_<Derived, Value, single_pass_traversal_tag>
      {
-          archetype() 
+          archetype()
            : traversal_archetype_<Derived, Value, single_pass_traversal_tag>(ctor_arg())
          {}
      };
@@ -241,7 +231,7 @@ namespace detail
  {
      template<class Derived, class Value>
      struct archetype
-        : public traversal_archetype_<Derived, Value, bidirectional_traversal_tag> 
+        : public traversal_archetype_<Derived, Value, bidirectional_traversal_tag>
      {
          Derived& operator+=(std::ptrdiff_t) { return static_object<Derived>::get(); }
          Derived& operator-=(std::ptrdiff_t) { return static_object<Derived>::get(); }
@@ -300,7 +290,7 @@ namespace detail


 template <class> struct undefined;
-  
+
 template <class AccessCategory>
 struct iterator_access_archetype_impl
 {
@@ -309,17 +299,15 @@ struct iterator_access_archetype_impl

 template <class Value, class AccessCategory>
 struct iterator_access_archetype
-  : mpl::aux::msvc_eti_base<
-        typename iterator_access_archetype_impl<
-            AccessCategory
-        >::template archetype<Value>
-    >::type
+  : iterator_access_archetype_impl<
+        AccessCategory
+    >::template archetype<Value>
 {
 };

 template <>
 struct iterator_access_archetype_impl<
-    iterator_archetypes::readable_iterator_t
+    archetypes::readable_iterator_t
 >
 {
    template <class Value>
@@ -337,15 +325,13 @@ struct iterator_access_archetype_impl<

 template <>
 struct iterator_access_archetype_impl<
-    iterator_archetypes::writable_iterator_t
+    archetypes::writable_iterator_t
 >
 {
    template <class Value>
    struct archetype
    {
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
        BOOST_STATIC_ASSERT(!is_const<Value>::value);
-# endif 
        typedef void value_type;
        typedef void reference;
        typedef void pointer;
@@ -356,13 +342,13 @@ struct iterator_access_archetype_impl<

 template <>
 struct iterator_access_archetype_impl<
-    iterator_archetypes::readable_writable_iterator_t
+    archetypes::readable_writable_iterator_t
 >
 {
    template <class Value>
    struct archetype
      : public virtual iterator_access_archetype<
-            Value, iterator_archetypes::readable_iterator_t
+            Value, archetypes::readable_iterator_t
        >
    {
        typedef detail::read_write_proxy<Value>    reference;
@@ -372,12 +358,12 @@ struct iterator_access_archetype_impl<
 };

 template <>
-struct iterator_access_archetype_impl<iterator_archetypes::readable_lvalue_iterator_t>
+struct iterator_access_archetype_impl<archetypes::readable_lvalue_iterator_t>
 {
    template <class Value>
    struct archetype
      : public virtual iterator_access_archetype<
-            Value, iterator_archetypes::readable_iterator_t
+            Value, archetypes::readable_iterator_t
        >
    {
        typedef Value&    reference;
@@ -386,28 +372,26 @@ struct iterator_access_archetype_impl<iterator_archetypes::readable_lvalue_itera
        Value* operator->() const { return 0; }
    };
 };
-  
+
 template <>
-struct iterator_access_archetype_impl<iterator_archetypes::writable_lvalue_iterator_t>
+struct iterator_access_archetype_impl<archetypes::writable_lvalue_iterator_t>
 {
    template <class Value>
    struct archetype
      : public virtual iterator_access_archetype<
-            Value, iterator_archetypes::readable_lvalue_iterator_t
+            Value, archetypes::readable_lvalue_iterator_t
        >
    {
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
        BOOST_STATIC_ASSERT((!is_const<Value>::value));
-# endif 
    };
 };
-  
+

 template <class Value, class AccessCategory, class TraversalCategory>
 struct iterator_archetype;
-  
+
 template <class Value, class AccessCategory, class TraversalCategory>
-struct traversal_archetype_base 
+struct traversal_archetype_base
  : detail::operator_brackets<
        typename remove_cv<Value>::type
      , AccessCategory
@@ -429,12 +413,12 @@ namespace detail
    , traversal_archetype_base<Value, AccessCategory, TraversalCategory>
  {
      typedef iterator_access_archetype<Value, AccessCategory> access;
-      
+
      typedef typename detail::facade_iterator_category<
          TraversalCategory
        , typename mpl::eval_if<
-              iterator_archetypes::has_access<
-                  AccessCategory, iterator_archetypes::writable_iterator_t
+              archetypes::has_access<
+                  AccessCategory, archetypes::writable_iterator_t
              >
            , remove_const<Value>
            , add_const<Value>
@@ -467,18 +451,18 @@ struct iterator_archetype
  , public detail::iterator_archetype_base<
        Value, AccessCategory, TraversalCategory
    >::workaround_iterator_base
-# endif 
+# endif
 {
    // Derivation from std::iterator above caused references to nested
    // types to be ambiguous, so now we have to redeclare them all
    // here.
 # if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, < 310)           \
    || BOOST_WORKAROUND(_RWSTD_VER, BOOST_TESTED_AT(0x20101))
-    
+
    typedef detail::iterator_archetype_base<
        Value,AccessCategory,TraversalCategory
    > base;
-    
+
    typedef typename base::value_type value_type;
    typedef typename base::reference reference;
    typedef typename base::pointer pointer;
@@ -509,7 +493,17 @@ struct iterator_archetype
 # endif
 };

+} // namespace iterators
+
+// Backward compatibility names
+namespace iterator_archetypes = iterators::archetypes;
+using iterators::access_archetype;
+using iterators::traversal_archetype;
+using iterators::iterator_archetype;
+using iterators::undefined;
+using iterators::iterator_access_archetype_impl;
+using iterators::traversal_archetype_base;
+
 } // namespace boost

-
 #endif // BOOST_ITERATOR_ARCHETYPES_HPP
--- a/include/boost/iterator/iterator_categories.hpp
+++ b/include/boost/iterator/iterator_categories.hpp
@@ -22,6 +22,7 @@
 # include <boost/static_assert.hpp>

 namespace boost {
+namespace iterators {

 //
 // Traversal Categories
@@ -29,34 +30,34 @@ namespace boost {

 struct no_traversal_tag {};

-struct incrementable_traversal_tag 
+struct incrementable_traversal_tag
  : no_traversal_tag
 {
 //     incrementable_traversal_tag() {}
 //     incrementable_traversal_tag(std::output_iterator_tag const&) {};
 };
-  
+
 struct single_pass_traversal_tag
  : incrementable_traversal_tag
 {
 //     single_pass_traversal_tag() {}
 //     single_pass_traversal_tag(std::input_iterator_tag const&) {};
 };
-  
+
 struct forward_traversal_tag
  : single_pass_traversal_tag
 {
 //     forward_traversal_tag() {}
 //     forward_traversal_tag(std::forward_iterator_tag const&) {};
 };
-  
+
 struct bidirectional_traversal_tag
  : forward_traversal_tag
 {
 //     bidirectional_traversal_tag() {};
 //     bidirectional_traversal_tag(std::bidirectional_iterator_tag const&) {};
 };
-  
+
 struct random_access_traversal_tag
  : bidirectional_traversal_tag
 {
@@ -65,7 +66,7 @@ struct random_access_traversal_tag
 };

 namespace detail
-{  
+{
  //
  // Convert a "strictly old-style" iterator category to a traversal
  // tag.  This is broken out into a separate metafunction to reduce
@@ -97,51 +98,8 @@ namespace detail
      >
  {};

-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-  template <>
-  struct old_category_to_traversal<int>
-  {
-      typedef int type;
-  };
-# endif
-
-  template <class Traversal>
-  struct pure_traversal_tag
-    : mpl::eval_if<
-          is_convertible<Traversal,random_access_traversal_tag>
-        , mpl::identity<random_access_traversal_tag>
-        , mpl::eval_if<
-              is_convertible<Traversal,bidirectional_traversal_tag>
-            , mpl::identity<bidirectional_traversal_tag>
-            , mpl::eval_if<
-                  is_convertible<Traversal,forward_traversal_tag>
-                , mpl::identity<forward_traversal_tag>
-                , mpl::eval_if<
-                      is_convertible<Traversal,single_pass_traversal_tag>
-                    , mpl::identity<single_pass_traversal_tag>
-                    , mpl::eval_if<
-                          is_convertible<Traversal,incrementable_traversal_tag>
-                        , mpl::identity<incrementable_traversal_tag>
-                        , void
-                      >
-                  >
-              >
-          >
-      >
-  {
-  };
-  
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-  template <>
-  struct pure_traversal_tag<int>
-  {
-      typedef int type;
-  };
-# endif
-
 } // namespace detail

-
 //
 // Convert an iterator category into a traversal tag
 //
@@ -150,7 +108,7 @@ struct iterator_category_to_traversal
  : mpl::eval_if< // if already convertible to a traversal tag, we're done.
        is_convertible<Cat,incrementable_traversal_tag>
      , mpl::identity<Cat>
-      , boost::detail::old_category_to_traversal<Cat>
+      , boost::iterators::detail::old_category_to_traversal<Cat>
    >
 {};

@@ -181,6 +139,75 @@ struct iterator_traversal<mpl::_>
 {};
 # endif

+//
+// Convert an iterator traversal to one of the traversal tags.
+//
+template <class Traversal>
+struct pure_traversal_tag
+  : mpl::eval_if<
+        is_convertible<Traversal,random_access_traversal_tag>
+      , mpl::identity<random_access_traversal_tag>
+      , mpl::eval_if<
+            is_convertible<Traversal,bidirectional_traversal_tag>
+          , mpl::identity<bidirectional_traversal_tag>
+          , mpl::eval_if<
+                is_convertible<Traversal,forward_traversal_tag>
+              , mpl::identity<forward_traversal_tag>
+              , mpl::eval_if<
+                    is_convertible<Traversal,single_pass_traversal_tag>
+                  , mpl::identity<single_pass_traversal_tag>
+                  , mpl::eval_if<
+                        is_convertible<Traversal,incrementable_traversal_tag>
+                      , mpl::identity<incrementable_traversal_tag>
+                      , void
+                    >
+                >
+            >
+        >
+    >
+{
+};
+
+//
+// Trait to retrieve one of the iterator traversal tags from the iterator category or traversal.
+//
+template <class Iterator = mpl::_1>
+struct pure_iterator_traversal
+  : pure_traversal_tag<typename iterator_traversal<Iterator>::type>
+{};
+
+# ifdef BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT
+template <>
+struct pure_iterator_traversal<mpl::_1>
+{
+    template <class T>
+    struct apply : pure_iterator_traversal<T>
+    {};
+};
+template <>
+struct pure_iterator_traversal<mpl::_>
+  : pure_iterator_traversal<mpl::_1>
+{};
+# endif
+
+} // namespace iterators
+
+using iterators::no_traversal_tag;
+using iterators::incrementable_traversal_tag;
+using iterators::single_pass_traversal_tag;
+using iterators::forward_traversal_tag;
+using iterators::bidirectional_traversal_tag;
+using iterators::random_access_traversal_tag;
+using iterators::iterator_category_to_traversal;
+using iterators::iterator_traversal;
+
+// This import is needed for backward compatibility with Boost.Range:
+// boost/range/detail/demote_iterator_traversal_tag.hpp
+// It should be removed when that header is fixed.
+namespace detail {
+using iterators::pure_traversal_tag;
+} // namespace detail
+
 } // namespace boost

 #include <boost/iterator/detail/config_undef.hpp>
--- a/include/boost/iterator/iterator_concepts.hpp
+++ b/include/boost/iterator/iterator_concepts.hpp
@@ -56,7 +56,7 @@ namespace boost_concepts
  private:
      Iterator i;
  };
-  
+
  template <
      typename Iterator
    , typename ValueType = BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::value_type
@@ -78,7 +78,7 @@ namespace boost_concepts
    , typename ValueType = BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::value_type
  >
  struct WritableIteratorConcept : WritableIterator<Iterator,ValueType> {};
-  
+
  BOOST_concept(SwappableIterator,(Iterator))
  {
      BOOST_CONCEPT_USAGE(SwappableIterator)
@@ -93,7 +93,7 @@ namespace boost_concepts
  BOOST_concept(LvalueIterator,(Iterator))
  {
      typedef typename boost::detail::iterator_traits<Iterator>::value_type value_type;
-      
+
      BOOST_CONCEPT_USAGE(LvalueIterator)
      {
        value_type& r = const_cast<value_type&>(*i);
@@ -103,7 +103,7 @@ namespace boost_concepts
      Iterator i;
  };

-  
+
  //===========================================================================
  // Iterator Traversal Concepts

@@ -145,7 +145,7 @@ namespace boost_concepts
    , boost::DefaultConstructible<Iterator>
  {
      typedef typename boost::detail::iterator_traits<Iterator>::difference_type difference_type;
-      
+
      BOOST_MPL_ASSERT((boost::is_integral<difference_type>));
      BOOST_MPL_ASSERT_RELATION(std::numeric_limits<difference_type>::is_signed, ==, true);

@@ -155,7 +155,7 @@ namespace boost_concepts
           , boost::forward_traversal_tag
          > ));
  };
-  
+
  BOOST_concept(BidirectionalTraversal,(Iterator))
    : ForwardTraversal<Iterator>
  {
@@ -192,14 +192,14 @@ namespace boost_concepts
          i = i - n;
          n = i - j;
      }
-      
+
   private:
      typename BidirectionalTraversal<Iterator>::difference_type n;
      Iterator i, j;
  };

  //===========================================================================
-  // Iterator Interoperability 
+  // Iterator Interoperability

  namespace detail
  {
@@ -248,19 +248,10 @@ namespace boost_concepts
  BOOST_concept(InteroperableIterator,(Iterator)(ConstIterator))
  {
   private:
-      typedef typename boost::detail::pure_traversal_tag<
-          typename boost::iterator_traversal<
-              Iterator
-          >::type
-      >::type traversal_category;
+      typedef typename boost::iterators::pure_iterator_traversal<Iterator>::type traversal_category;
+      typedef typename boost::iterators::pure_iterator_traversal<ConstIterator>::type const_traversal_category;

-      typedef typename boost::detail::pure_traversal_tag<
-          typename boost::iterator_traversal<
-              ConstIterator
-          >::type
-      >::type const_traversal_category;
-      
-  public:
+   public:
      BOOST_CONCEPT_ASSERT((SinglePassIterator<Iterator>));
      BOOST_CONCEPT_ASSERT((SinglePassIterator<ConstIterator>));

@@ -271,7 +262,7 @@ namespace boost_concepts

          ci = i;
      }
-      
+
   private:
      Iterator      i;
      ConstIterator ci;
--- a/include/boost/iterator/iterator_facade.hpp
+++ b/include/boost/iterator/iterator_facade.hpp
@@ -7,9 +7,11 @@
 #ifndef BOOST_ITERATOR_FACADE_23022003THW_HPP
 #define BOOST_ITERATOR_FACADE_23022003THW_HPP

+#include <boost/config.hpp>
 #include <boost/iterator.hpp>
 #include <boost/iterator/interoperable.hpp>
 #include <boost/iterator/iterator_traits.hpp>
+#include <boost/iterator/iterator_categories.hpp>

 #include <boost/iterator/detail/facade_iterator_category.hpp>
 #include <boost/iterator/detail/enable_if.hpp>
@@ -20,6 +22,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_pointer.hpp>
+#include <boost/type_traits/add_lvalue_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_convertible.hpp>
@@ -36,8 +39,9 @@

 #include <boost/iterator/detail/config_def.hpp> // this goes last

-namespace boost
-{
+namespace boost {
+namespace iterators {
+
  // This forward declaration is required for the friend declaration
  // in iterator_core_access
  template <class I, class V, class TC, class R, class D> class iterator_facade;
@@ -56,6 +60,12 @@ namespace boost
        };
    };

+    // The type trait checks if the category or traversal is at least as advanced as the specified required traversal
+    template< typename CategoryOrTraversal, typename Required >
+    struct is_traversal_at_least :
+        public boost::is_convertible< typename iterator_category_to_traversal< CategoryOrTraversal >::type, Required >
+    {};
+
    //
    // enable if for use in operator implementation.
    //
@@ -64,28 +74,31 @@ namespace boost
      , class Facade2
      , class Return
    >
-    struct enable_if_interoperable
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-    {
-        typedef typename mpl::if_<
-            mpl::or_<
-                is_convertible<Facade1, Facade2>
-              , is_convertible<Facade2, Facade1>
-            >
+    struct enable_if_interoperable :
+        public boost::iterators::enable_if<
+            is_interoperable< Facade1, Facade2 >
+          , Return
+        >
+    {};
+
+    //
+    // enable if for use in implementation of operators specific for random access traversal.
+    //
+    template <
+        class Facade1
+      , class Facade2
+      , class Return
+    >
+    struct enable_if_interoperable_and_random_access_traversal :
+        public boost::iterators::enable_if<
+            mpl::and_<
+                is_interoperable< Facade1, Facade2 >
+              , is_traversal_at_least< typename iterator_category< Facade1 >::type, random_access_traversal_tag >
+              , is_traversal_at_least< typename iterator_category< Facade2 >::type, random_access_traversal_tag >
+            >
          , Return
-          , int[3]
-        >::type type;
-    };        
-#else
-      : ::boost::iterators::enable_if<
-           mpl::or_<
-               is_convertible<Facade1, Facade2>
-             , is_convertible<Facade2, Facade1>
-           >
-         , Return
        >
    {};
-#endif 

    //
    // Generates associated types for an iterator_facade with the
@@ -94,7 +107,7 @@ namespace boost
    template <
        class ValueParam
      , class CategoryOrTraversal
-      , class Reference 
+      , class Reference
      , class Difference
    >
    struct iterator_facade_types
@@ -102,16 +115,16 @@ namespace boost
        typedef typename facade_iterator_category<
            CategoryOrTraversal, ValueParam, Reference
        >::type iterator_category;
-        
+
        typedef typename remove_const<ValueParam>::type value_type;
-        
+
        // Not the real associated pointer type
        typedef typename mpl::eval_if<
-            boost::detail::iterator_writability_disabled<ValueParam,Reference>
+            boost::iterators::detail::iterator_writability_disabled<ValueParam,Reference>
          , add_pointer<const value_type>
          , add_pointer<value_type>
        >::type pointer;
-      
+
 # if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)                          \
    && (BOOST_WORKAROUND(_STLPORT_VERSION, BOOST_TESTED_AT(0x452))              \
        || BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, BOOST_TESTED_AT(310)))     \
@@ -157,7 +170,7 @@ namespace boost
     private:
        mutable value_type stored_value;
    };
-    
+
    //
    // In general, we can't determine that such an iterator isn't
    // writable -- we also need to store a copy of the old iterator so
@@ -209,7 +222,7 @@ namespace boost
        {
            return stored_iterator;
        }
-        
+
     private:
        mutable value_type stored_value;
        Iterator stored_iterator;
@@ -221,7 +234,7 @@ namespace boost
    struct is_non_proxy_reference_impl
    {
        static Reference r;
-        
+
        template <class R>
        static typename mpl::if_<
            is_convertible<
@@ -231,17 +244,17 @@ namespace boost
          , char[1]
          , char[2]
        >::type& helper(R const&);
-        
+
        BOOST_STATIC_CONSTANT(bool, value = sizeof(helper(r)) == 1);
    };
-        
+
    template <class Reference, class Value>
    struct is_non_proxy_reference
      : mpl::bool_<
            is_non_proxy_reference_impl<Reference, Value>::value
        >
    {};
-# else 
+# else
    template <class Reference, class Value>
    struct is_non_proxy_reference
      : is_convertible<
@@ -250,8 +263,8 @@ namespace boost
          , Value const volatile*
        >
    {};
-# endif 
-        
+# endif
+
    // A metafunction to choose the result type of postfix ++
    //
    // Because the C++98 input iterator requirements say that *r++ has
@@ -272,8 +285,16 @@ namespace boost
      : mpl::eval_if<
            mpl::and_<
                // A proxy is only needed for readable iterators
-                is_convertible<Reference,Value const&>
-                
+                is_convertible<
+                    Reference
+                    // Use add_lvalue_reference to form `reference to Value` due to
+                    // some (strict) C++03 compilers (e.g. `gcc -std=c++03`) reject
+                    // 'reference-to-reference' in the template which described in CWG
+                    // DR106.
+                    // http://www.open-std.org/Jtc1/sc22/wg21/docs/cwg_defects.html#106
+                  , typename add_lvalue_reference<Value const>::type
+                >
+
                // No multipass iterator can have values that disappear
                // before positions can be re-visited
              , mpl::not_<
@@ -325,15 +346,6 @@ namespace boost
        }
    };

-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-    // Deal with ETI
-    template<>
-    struct operator_arrow_dispatch<int, int>
-    {
-        typedef int result_type;
-    };
-# endif
-
    // A proxy return type for operator[], needed to deal with
    // iterators that may invalidate referents upon destruction.
    // Consider the temporary iterator in *(a + n)
@@ -378,7 +390,7 @@ namespace boost
            >
        >
    {};
-        
+
    template <class Iterator, class Value, class Reference>
    struct operator_brackets_result
    {
@@ -408,28 +420,34 @@ namespace boost
          :
 # ifdef BOOST_NO_ONE_WAY_ITERATOR_INTEROP
          iterator_difference<I1>
-# elif BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-          mpl::if_<
-              is_convertible<I2,I1>
-            , typename I1::difference_type
-            , typename I2::difference_type
-          >
-# else 
+# else
          mpl::eval_if<
              is_convertible<I2,I1>
            , iterator_difference<I1>
            , iterator_difference<I2>
          >
-# endif 
+# endif
        {};

    };
+
+    template <
+        class Derived
+      , class Value
+      , class CategoryOrTraversal
+      , class Reference
+      , class Difference
+      , bool IsBidirectionalTraversal
+      , bool IsRandomAccessTraversal
+    >
+    class iterator_facade_base;
+
  } // namespace detail


  // Macros which describe the declarations of binary operators
 # ifdef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
-#  define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type)       \
+#  define BOOST_ITERATOR_FACADE_INTEROP_HEAD_IMPL(prefix, op, result_type, enabler)       \
    template <                                                              \
        class Derived1, class V1, class TC1, class Reference1, class Difference1 \
      , class Derived2, class V2, class TC2, class Reference2, class Difference2 \
@@ -438,24 +456,33 @@ namespace boost
    operator op(                                                            \
        iterator_facade<Derived1, V1, TC1, Reference1, Difference1> const& lhs   \
      , iterator_facade<Derived2, V2, TC2, Reference2, Difference2> const& rhs)
-# else 
-#  define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type)   \
+# else
+#  define BOOST_ITERATOR_FACADE_INTEROP_HEAD_IMPL(prefix, op, result_type, enabler)   \
    template <                                                          \
        class Derived1, class V1, class TC1, class Reference1, class Difference1 \
      , class Derived2, class V2, class TC2, class Reference2, class Difference2 \
    >                                                                   \
-    prefix typename boost::detail::enable_if_interoperable<             \
+    prefix typename enabler<                                            \
        Derived1, Derived2                                              \
      , typename mpl::apply2<result_type,Derived1,Derived2>::type       \
    >::type                                                             \
    operator op(                                                        \
        iterator_facade<Derived1, V1, TC1, Reference1, Difference1> const& lhs   \
      , iterator_facade<Derived2, V2, TC2, Reference2, Difference2> const& rhs)
-# endif 
+# endif
+
+#  define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type)       \
+    BOOST_ITERATOR_FACADE_INTEROP_HEAD_IMPL(prefix, op, result_type, boost::iterators::detail::enable_if_interoperable)
+
+#  define BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD(prefix, op, result_type)       \
+    BOOST_ITERATOR_FACADE_INTEROP_HEAD_IMPL(prefix, op, result_type, boost::iterators::detail::enable_if_interoperable_and_random_access_traversal)

 #  define BOOST_ITERATOR_FACADE_PLUS_HEAD(prefix,args)              \
    template <class Derived, class V, class TC, class R, class D>   \
-    prefix Derived operator+ args
+    prefix typename boost::iterators::enable_if<                    \
+        boost::iterators::detail::is_traversal_at_least< TC, boost::iterators::random_access_traversal_tag >,  \
+        Derived                                                     \
+    >::type operator+ args

  //
  // Helper class for granting access to the iterator core interface.
@@ -468,41 +495,49 @@ namespace boost
  //
  class iterator_core_access
  {
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  
+# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
      // Tasteless as this may seem, making all members public allows member templates
      // to work in the absence of member template friends.
   public:
 # else
-      
+
      template <class I, class V, class TC, class R, class D> friend class iterator_facade;
+      template <class I, class V, class TC, class R, class D, bool IsBidirectionalTraversal, bool IsRandomAccessTraversal>
+      friend class detail::iterator_facade_base;

 #  define BOOST_ITERATOR_FACADE_RELATION(op)                                \
-      BOOST_ITERATOR_FACADE_INTEROP_HEAD(friend,op, boost::detail::always_bool2);
+      BOOST_ITERATOR_FACADE_INTEROP_HEAD(friend,op, boost::iterators::detail::always_bool2);

      BOOST_ITERATOR_FACADE_RELATION(==)
      BOOST_ITERATOR_FACADE_RELATION(!=)

-      BOOST_ITERATOR_FACADE_RELATION(<)
-      BOOST_ITERATOR_FACADE_RELATION(>)
-      BOOST_ITERATOR_FACADE_RELATION(<=)
-      BOOST_ITERATOR_FACADE_RELATION(>=)
 #  undef BOOST_ITERATOR_FACADE_RELATION

-      BOOST_ITERATOR_FACADE_INTEROP_HEAD(
-          friend, -, boost::detail::choose_difference_type)
+#  define BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(op)                                \
+      BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD(friend,op, boost::iterators::detail::always_bool2);
+
+      BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(<)
+      BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(>)
+      BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(<=)
+      BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(>=)
+
+#  undef BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION
+
+      BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD(
+          friend, -, boost::iterators::detail::choose_difference_type)
      ;

      BOOST_ITERATOR_FACADE_PLUS_HEAD(
          friend inline
-          , (iterator_facade<Derived, V, TC, R, D> const&
-           , typename Derived::difference_type)
+        , (iterator_facade<Derived, V, TC, R, D> const&
+        , typename Derived::difference_type)
      )
      ;

      BOOST_ITERATOR_FACADE_PLUS_HEAD(
          friend inline
        , (typename Derived::difference_type
-           , iterator_facade<Derived, V, TC, R, D> const&)
+        , iterator_facade<Derived, V, TC, R, D> const&)
      )
      ;

@@ -573,11 +608,156 @@ namespace boost
          return *static_cast<I const*>(&facade);
      }

-   private:
      // objects of this class are useless
-      iterator_core_access(); //undefined
+      BOOST_DELETED_FUNCTION(iterator_core_access())
  };

+  namespace detail {
+
+    // Implementation for forward traversal iterators
+    template <
+        class Derived
+      , class Value
+      , class CategoryOrTraversal
+      , class Reference
+      , class Difference
+    >
+    class iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, false, false >
+# ifdef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
+        : public boost::iterators::detail::iterator_facade_types<
+             Value, CategoryOrTraversal, Reference, Difference
+          >::base
+#  undef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
+# endif
+    {
+    private:
+        typedef boost::iterators::detail::iterator_facade_types<
+            Value, CategoryOrTraversal, Reference, Difference
+        > associated_types;
+
+        typedef boost::iterators::detail::operator_arrow_dispatch<
+            Reference
+          , typename associated_types::pointer
+        > operator_arrow_dispatch_;
+
+    public:
+        typedef typename associated_types::value_type value_type;
+        typedef Reference reference;
+        typedef Difference difference_type;
+
+        typedef typename operator_arrow_dispatch_::result_type pointer;
+
+        typedef typename associated_types::iterator_category iterator_category;
+
+    public:
+        reference operator*() const
+        {
+            return iterator_core_access::dereference(this->derived());
+        }
+
+        pointer operator->() const
+        {
+            return operator_arrow_dispatch_::apply(*this->derived());
+        }
+
+        Derived& operator++()
+        {
+            iterator_core_access::increment(this->derived());
+            return this->derived();
+        }
+
+    protected:
+        //
+        // Curiously Recurring Template interface.
+        //
+        Derived& derived()
+        {
+            return *static_cast<Derived*>(this);
+        }
+
+        Derived const& derived() const
+        {
+            return *static_cast<Derived const*>(this);
+        }
+    };
+
+    // Implementation for bidirectional traversal iterators
+    template <
+        class Derived
+      , class Value
+      , class CategoryOrTraversal
+      , class Reference
+      , class Difference
+    >
+    class iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, true, false > :
+        public iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, false, false >
+    {
+    public:
+        Derived& operator--()
+        {
+            iterator_core_access::decrement(this->derived());
+            return this->derived();
+        }
+
+        Derived operator--(int)
+        {
+            Derived tmp(this->derived());
+            --*this;
+            return tmp;
+        }
+    };
+
+    // Implementation for random access traversal iterators
+    template <
+        class Derived
+      , class Value
+      , class CategoryOrTraversal
+      , class Reference
+      , class Difference
+    >
+    class iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, true, true > :
+        public iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, true, false >
+    {
+    private:
+        typedef iterator_facade_base< Derived, Value, CategoryOrTraversal, Reference, Difference, true, false > base_type;
+
+    public:
+        typedef typename base_type::reference reference;
+        typedef typename base_type::difference_type difference_type;
+
+    public:
+        typename boost::iterators::detail::operator_brackets_result<Derived, Value, reference>::type
+        operator[](difference_type n) const
+        {
+            typedef boost::iterators::detail::use_operator_brackets_proxy<Value, Reference> use_proxy;
+
+            return boost::iterators::detail::make_operator_brackets_result<Derived>(
+                this->derived() + n
+              , use_proxy()
+            );
+        }
+
+        Derived& operator+=(difference_type n)
+        {
+            iterator_core_access::advance(this->derived(), n);
+            return this->derived();
+        }
+
+        Derived& operator-=(difference_type n)
+        {
+            iterator_core_access::advance(this->derived(), -n);
+            return this->derived();
+        }
+
+        Derived operator-(difference_type x) const
+        {
+            Derived result(this->derived());
+            return result -= x;
+        }
+    };
+
+  } // namespace detail
+
  //
  // iterator_facade - use as a public base class for defining new
  // standard-conforming iterators.
@@ -589,151 +769,38 @@ namespace boost
    , class Reference   = Value&
    , class Difference  = std::ptrdiff_t
  >
-  class iterator_facade
-# ifdef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
-    : public boost::detail::iterator_facade_types<
-         Value, CategoryOrTraversal, Reference, Difference
-      >::base
-#  undef BOOST_ITERATOR_FACADE_NEEDS_ITERATOR_BASE
-# endif
+  class iterator_facade :
+      public detail::iterator_facade_base<
+          Derived,
+          Value,
+          CategoryOrTraversal,
+          Reference,
+          Difference,
+          detail::is_traversal_at_least< CategoryOrTraversal, bidirectional_traversal_tag >::value,
+          detail::is_traversal_at_least< CategoryOrTraversal, random_access_traversal_tag >::value
+      >
  {
-   private:
-      //
-      // Curiously Recurring Template interface.
-      //
-      Derived& derived()
-      {
-          return *static_cast<Derived*>(this);
-      }
-
-      Derived const& derived() const
-      {
-          return *static_cast<Derived const*>(this);
-      }
-
-      typedef boost::detail::iterator_facade_types<
-         Value, CategoryOrTraversal, Reference, Difference
-      > associated_types;
-
-      typedef boost::detail::operator_arrow_dispatch<
-          Reference
-        , typename associated_types::pointer
-      > operator_arrow_dispatch_;
-
-   protected:
+  protected:
      // For use by derived classes
      typedef iterator_facade<Derived,Value,CategoryOrTraversal,Reference,Difference> iterator_facade_;
-      
-   public:
-
-      typedef typename associated_types::value_type value_type;
-      typedef Reference reference;
-      typedef Difference difference_type;
-
-      typedef typename operator_arrow_dispatch_::result_type pointer;
-
-      typedef typename associated_types::iterator_category iterator_category;
-
-      reference operator*() const
-      {
-          return iterator_core_access::dereference(this->derived());
-      }
-
-      pointer operator->() const
-      {
-          return operator_arrow_dispatch_::apply(*this->derived());
-      }
-        
-      typename boost::detail::operator_brackets_result<Derived,Value,reference>::type
-      operator[](difference_type n) const
-      {
-          typedef boost::detail::use_operator_brackets_proxy<Value,Reference> use_proxy;
-          
-          return boost::detail::make_operator_brackets_result<Derived>(
-              this->derived() + n
-            , use_proxy()
-          );
-      }
-
-      Derived& operator++()
-      {
-          iterator_core_access::increment(this->derived());
-          return this->derived();
-      }
-
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-      typename boost::detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
-      operator++(int)
-      {
-          typename boost::detail::postfix_increment_result<Derived,Value,Reference,CategoryOrTraversal>::type
-          tmp(this->derived());
-          ++*this;
-          return tmp;
-      }
-# endif
-      
-      Derived& operator--()
-      {
-          iterator_core_access::decrement(this->derived());
-          return this->derived();
-      }
-
-      Derived operator--(int)
-      {
-          Derived tmp(this->derived());
-          --*this;
-          return tmp;
-      }
-
-      Derived& operator+=(difference_type n)
-      {
-          iterator_core_access::advance(this->derived(), n);
-          return this->derived();
-      }
-
-      Derived& operator-=(difference_type n)
-      {
-          iterator_core_access::advance(this->derived(), -n);
-          return this->derived();
-      }
-
-      Derived operator-(difference_type x) const
-      {
-          Derived result(this->derived());
-          return result -= x;
-      }
-
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-      // There appears to be a bug which trashes the data of classes
-      // derived from iterator_facade when they are assigned unless we
-      // define this assignment operator.  This bug is only revealed
-      // (so far) in STLPort debug mode, but it's clearly a codegen
-      // problem so we apply the workaround for all MSVC6.
-      iterator_facade& operator=(iterator_facade const&)
-      {
-          return *this;
-      }
-# endif
  };

-# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
  template <class I, class V, class TC, class R, class D>
-  inline typename boost::detail::postfix_increment_result<I,V,R,TC>::type
+  inline typename boost::iterators::detail::postfix_increment_result<I,V,R,TC>::type
  operator++(
      iterator_facade<I,V,TC,R,D>& i
    , int
  )
  {
-      typename boost::detail::postfix_increment_result<I,V,R,TC>::type
+      typename boost::iterators::detail::postfix_increment_result<I,V,R,TC>::type
          tmp(*static_cast<I*>(&i));
-      
+
      ++i;
-      
+
      return tmp;
  }
-# endif 

-  
+
  //
  // Comparison operator implementation. The library supplied operators
  // enables the user to provide fully interoperable constant/mutable
@@ -824,7 +891,7 @@ namespace boost
 # define BOOST_ITERATOR_FACADE_RELATION(op, return_prefix, base_op) \
  BOOST_ITERATOR_FACADE_INTEROP(                                    \
      op                                                            \
-    , boost::detail::always_bool2                                   \
+    , boost::iterators::detail::always_bool2                                   \
    , return_prefix                                                 \
    , base_op                                                       \
  )
@@ -832,21 +899,50 @@ namespace boost
  BOOST_ITERATOR_FACADE_RELATION(==, return, equal)
  BOOST_ITERATOR_FACADE_RELATION(!=, return !, equal)

-  BOOST_ITERATOR_FACADE_RELATION(<, return 0 >, distance_from)
-  BOOST_ITERATOR_FACADE_RELATION(>, return 0 <, distance_from)
-  BOOST_ITERATOR_FACADE_RELATION(<=, return 0 >=, distance_from)
-  BOOST_ITERATOR_FACADE_RELATION(>=, return 0 <=, distance_from)
 # undef BOOST_ITERATOR_FACADE_RELATION

+
+# define BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS(op, result_type, return_prefix, base_op) \
+  BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD(inline, op, result_type)                   \
+  {                                                                             \
+      /* For those compilers that do not support enable_if */                   \
+      BOOST_STATIC_ASSERT((                                                     \
+          is_interoperable< Derived1, Derived2 >::value &&                      \
+          boost::iterators::detail::is_traversal_at_least< typename iterator_category< Derived1 >::type, random_access_traversal_tag >::value && \
+          boost::iterators::detail::is_traversal_at_least< typename iterator_category< Derived2 >::type, random_access_traversal_tag >::value \
+      ));                                                                       \
+      return_prefix iterator_core_access::base_op(                              \
+          *static_cast<Derived1 const*>(&lhs)                                   \
+        , *static_cast<Derived2 const*>(&rhs)                                   \
+        , BOOST_ITERATOR_CONVERTIBLE(Derived2,Derived1)                         \
+      );                                                                        \
+  }
+
+# define BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(op, return_prefix, base_op) \
+  BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS(                                    \
+      op                                                            \
+    , boost::iterators::detail::always_bool2                                   \
+    , return_prefix                                                 \
+    , base_op                                                       \
+  )
+
+  BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(<, return 0 >, distance_from)
+  BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(>, return 0 <, distance_from)
+  BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(<=, return 0 >=, distance_from)
+  BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION(>=, return 0 <=, distance_from)
+
+# undef BOOST_ITERATOR_FACADE_RANDOM_ACCESS_RELATION
+
  // operator- requires an additional part in the static assertion
-  BOOST_ITERATOR_FACADE_INTEROP(
+  BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS(
      -
-    , boost::detail::choose_difference_type
+    , boost::iterators::detail::choose_difference_type
    , return
    , distance_from
  )
+
 # undef BOOST_ITERATOR_FACADE_INTEROP
-# undef BOOST_ITERATOR_FACADE_INTEROP_HEAD
+# undef BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS

 # define BOOST_ITERATOR_FACADE_PLUS(args)           \
  BOOST_ITERATOR_FACADE_PLUS_HEAD(inline, args)     \
@@ -855,18 +951,28 @@ namespace boost
      return tmp += n;                              \
  }

-BOOST_ITERATOR_FACADE_PLUS((
-  iterator_facade<Derived, V, TC, R, D> const& i
-  , typename Derived::difference_type n
-))
+  BOOST_ITERATOR_FACADE_PLUS((
+      iterator_facade<Derived, V, TC, R, D> const& i
+    , typename Derived::difference_type n
+  ))

-BOOST_ITERATOR_FACADE_PLUS((
-    typename Derived::difference_type n
+  BOOST_ITERATOR_FACADE_PLUS((
+      typename Derived::difference_type n
    , iterator_facade<Derived, V, TC, R, D> const& i
-))
+  ))
+
 # undef BOOST_ITERATOR_FACADE_PLUS
 # undef BOOST_ITERATOR_FACADE_PLUS_HEAD

+# undef BOOST_ITERATOR_FACADE_INTEROP_HEAD
+# undef BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD
+# undef BOOST_ITERATOR_FACADE_INTEROP_HEAD_IMPL
+
+} // namespace iterators
+
+using iterators::iterator_core_access;
+using iterators::iterator_facade;
+
 } // namespace boost

 #include <boost/iterator/detail/config_undef.hpp>
--- a/include/boost/iterator/iterator_traits.hpp
+++ b/include/boost/iterator/iterator_traits.hpp
@@ -8,20 +8,12 @@
 # include <boost/detail/iterator.hpp>
 # include <boost/detail/workaround.hpp>

-namespace boost { 
+namespace boost {
+namespace iterators {

-// Unfortunately, g++ 2.95.x chokes when we define a class template
-// iterator_category which has the same name as its
-// std::iterator_category() function, probably due in part to the
-// "std:: is visible globally" hack it uses.  Use
-// BOOST_ITERATOR_CATEGORY to write code that's portable to older
-// GCCs.
-
-# if BOOST_WORKAROUND(__GNUC__, <= 2)
-#  define BOOST_ITERATOR_CATEGORY iterator_category_
-# else
-#  define BOOST_ITERATOR_CATEGORY iterator_category
-# endif
+// Macro for supporting old compilers, no longer needed but kept
+// for backwards compatibility (it was documented).
+#define BOOST_ITERATOR_CATEGORY iterator_category


 template <class Iterator>
@@ -29,20 +21,20 @@ struct iterator_value
 {
    typedef typename boost::detail::iterator_traits<Iterator>::value_type type;
 };
-  
+
 template <class Iterator>
 struct iterator_reference
 {
    typedef typename boost::detail::iterator_traits<Iterator>::reference type;
 };
-  
-  
+
+
 template <class Iterator>
 struct iterator_pointer
 {
    typedef typename boost::detail::iterator_traits<Iterator>::pointer type;
 };
-  
+
 template <class Iterator>
 struct iterator_difference
 {
@@ -50,43 +42,19 @@ struct iterator_difference
 };

 template <class Iterator>
-struct BOOST_ITERATOR_CATEGORY
+struct iterator_category
 {
    typedef typename boost::detail::iterator_traits<Iterator>::iterator_category type;
 };

-# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-template <>
-struct iterator_value<int>
-{
-    typedef void type;
-};
-  
-template <>
-struct iterator_reference<int>
-{
-    typedef void type;
-};
+} // namespace iterators

-template <>
-struct iterator_pointer<int>
-{
-    typedef void type;
-};
-  
-template <>
-struct iterator_difference<int>
-{
-    typedef void type;
-};
-  
-template <>
-struct BOOST_ITERATOR_CATEGORY<int>
-{
-    typedef void type;
-};
-# endif
+using iterators::iterator_value;
+using iterators::iterator_reference;
+using iterators::iterator_pointer;
+using iterators::iterator_difference;
+using iterators::iterator_category;

-} // namespace boost::iterator
+} // namespace boost

 #endif // ITERATOR_TRAITS_DWA200347_HPP
--- a/include/boost/iterator/minimum_category.hpp
+++ b/include/boost/iterator/minimum_category.hpp
@@ -0,0 +1,95 @@
+// Copyright David Abrahams 2003. Use, modification and distribution is
+// subject to the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#ifndef BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
+# define BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
+
+# include <boost/static_assert.hpp>
+# include <boost/type_traits/is_convertible.hpp>
+# include <boost/type_traits/is_same.hpp>
+
+# include <boost/mpl/placeholders.hpp>
+# include <boost/mpl/aux_/lambda_support.hpp>
+
+namespace boost {
+namespace iterators {
+namespace detail {
+
+template <bool GreaterEqual, bool LessEqual>
+struct minimum_category_impl;
+
+template <class T1, class T2>
+struct error_not_related_by_convertibility;
+
+template <>
+struct minimum_category_impl<true,false>
+{
+    template <class T1, class T2> struct apply
+    {
+        typedef T2 type;
+    };
+};
+
+template <>
+struct minimum_category_impl<false,true>
+{
+    template <class T1, class T2> struct apply
+    {
+        typedef T1 type;
+    };
+};
+
+template <>
+struct minimum_category_impl<true,true>
+{
+    template <class T1, class T2> struct apply
+    {
+        BOOST_STATIC_ASSERT((is_same<T1,T2>::value));
+        typedef T1 type;
+    };
+};
+
+template <>
+struct minimum_category_impl<false,false>
+{
+    template <class T1, class T2> struct apply
+      : error_not_related_by_convertibility<T1,T2>
+    {
+    };
+};
+
+} // namespace detail
+
+//
+// Returns the minimum category type or fails to compile
+// if T1 and T2 are unrelated.
+//
+template <class T1 = mpl::_1, class T2 = mpl::_2>
+struct minimum_category
+{
+    typedef boost::iterators::detail::minimum_category_impl<
+        ::boost::is_convertible<T1,T2>::value
+      , ::boost::is_convertible<T2,T1>::value
+    > outer;
+
+    typedef typename outer::template apply<T1,T2> inner;
+    typedef typename inner::type type;
+
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2,minimum_category,(T1,T2))
+};
+
+template <>
+struct minimum_category<mpl::_1,mpl::_2>
+{
+    template <class T1, class T2>
+    struct apply : minimum_category<T1,T2>
+    {};
+
+    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(2,minimum_category,(mpl::_1,mpl::_2))
+};
+
+} // namespace iterators
+
+} // namespace boost
+
+#endif // BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
--- a/include/boost/iterator/permutation_iterator.hpp
+++ b/include/boost/iterator/permutation_iterator.hpp
@@ -13,28 +13,28 @@
 #include <boost/iterator/iterator_adaptor.hpp>


-namespace boost
-{
+namespace boost {
+namespace iterators {

 template< class ElementIterator
        , class IndexIterator>
 class permutation_iterator
-  : public iterator_adaptor< 
+  : public iterator_adaptor<
             permutation_iterator<ElementIterator, IndexIterator>
-           , IndexIterator, typename detail::iterator_traits<ElementIterator>::value_type
-           , use_default, typename detail::iterator_traits<ElementIterator>::reference>
+           , IndexIterator, typename boost::detail::iterator_traits<ElementIterator>::value_type
+           , use_default, typename boost::detail::iterator_traits<ElementIterator>::reference>
 {
-  typedef iterator_adaptor< 
+  typedef iterator_adaptor<
            permutation_iterator<ElementIterator, IndexIterator>
-          , IndexIterator, typename detail::iterator_traits<ElementIterator>::value_type
-          , use_default, typename detail::iterator_traits<ElementIterator>::reference> super_t;
+          , IndexIterator, typename boost::detail::iterator_traits<ElementIterator>::value_type
+          , use_default, typename boost::detail::iterator_traits<ElementIterator>::reference> super_t;

  friend class iterator_core_access;

 public:
  permutation_iterator() : m_elt_iter() {}

-  explicit permutation_iterator(ElementIterator x, IndexIterator y) 
+  explicit permutation_iterator(ElementIterator x, IndexIterator y)
      : super_t(y), m_elt_iter(x) {}

  template<class OtherElementIterator, class OtherIndexIterator>
@@ -54,18 +54,22 @@ private:
    template <class,class> friend class permutation_iterator;
 #else
 public:
-#endif 
+#endif
    ElementIterator m_elt_iter;
 };


 template <class ElementIterator, class IndexIterator>
-permutation_iterator<ElementIterator, IndexIterator> 
+inline permutation_iterator<ElementIterator, IndexIterator>
 make_permutation_iterator( ElementIterator e, IndexIterator i )
 {
    return permutation_iterator<ElementIterator, IndexIterator>( e, i );
 }

+} // namespace iterators
+
+using iterators::permutation_iterator;
+using iterators::make_permutation_iterator;

 } // namespace boost

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edward Diener	ed027c2cce	Merge branch 'develop' # Conflicts: # include/boost/iterator/reverse_iterator.hpp	2017-07-17 12:03:38 -04:00
Edward Diener	4791425000	Merge pull request #27 from Lastique/advance_generic_distance Use a separate template parameter for distance in advance().	2017-07-12 12:20:34 -04:00
Edward Diener	b7e7e83a11	Merge pull request #28 from Lastique/patch-2 Avoid integer overflow on negating distance in reverse_iterator	2017-07-12 12:17:22 -04:00
Andrey Semashev	c148962bd9	Avoid integer overflow on negating distance	2017-07-10 14:57:40 +03:00
Andrey Semashev	5bfbfb7716	Use a separate template parameter for distance in advance(). This follows std::advance interface and also allows to use distance types other than iterator's difference_type (if the iterator supports that).	2017-07-10 14:51:07 +03:00
Edward Diener	af5f6e49e0	Merge pull request #26 from Lastique/patch-2 Remove dependency on boost::prior.	2017-07-09 11:59:18 -04:00
Andrey Semashev	26ee5ba754	Remove dependency on boost::prior.	2017-07-09 18:31:06 +03:00
Edward Diener	67a2336cf4	Merge pull request #25 from morinmorin/add_readable_iterator_tests Add more ReabableIterator tests for advance/distance	2017-07-09 11:14:04 -04:00
morinmorin	029277f3ed	Add more tests for ReabableIterator	2017-07-08 13:30:28 +09:00
Edward Diener	847b2a1be3	Added Travis testing	2017-06-30 20:29:49 -04:00
Edward Diener	18268069d9	Merge pull request #24 from morinmorin/add_advance_and_distance Add boost::advance and boost::distance	2017-06-29 15:02:38 -04:00
morinmorin	bb54ee7900	Update Jamfile.v2 for new tests	2017-06-29 22:49:05 +09:00
morinmorin	d5b67c7fab	Add tests for boost::advance/distance	2017-06-29 22:09:26 +09:00
morinmorin	663a30f659	Implement BoostIteratorTraversalConcepts-aware boost::advance/distance	2017-06-29 22:06:12 +09:00
Edward Diener	177f719d15	Merge branch 'develop'	2017-04-24 12:24:21 -04:00
Edward Diener	cccbd8c6aa	Test needs both std::typle support and variadic template support.	2017-04-08 16:53:02 -04:00
Edward Diener	d6cfed4b20	Merge pull request #23 from morinmorin/testcase_for_trac_12895 Testcase for PR #22 (trac ticket 12895)	2017-03-15 12:19:13 -04:00
Edward Diener	514ac53326	Merge pull request #22 from Dani-Hub/develop Bug fix for ticket #12895: Apply remove_reference before remove_cv	2017-03-15 12:12:12 -04:00
morinmorin	ca3b7505ce	Add a testcase for trac ticket 12895	2017-03-15 20:41:24 +09:00
drgler	d7c8cccd64	Bug fix for ticket #12895 : Apply remove_reference before remove_cv	2017-03-14 20:45:48 +01:00
Edward Diener	7b627fa679	Merge branch 'develop'	2017-01-04 10:58:14 -05:00
Edward Diener	760da84f9c	Merge branch 'develop' of https://github.com/eldiener/iterator into nekko1119-support-lambda-expression	2016-12-17 19:34:48 -05:00
Edward Diener	89d3ec7662	Add inclusion of config.hpp	2016-12-17 19:32:52 -05:00
Edward Diener	c86db2ec8a	Merge branch 'support-lambda-expression' of https://github.com/nekko1119/iterator into nekko1119-support-lambda-expression	2016-12-16 04:22:44 -05:00
Edward Diener	0a18cfb255	Merge pull request #21 from Wilson-N/feature-bug-fix-8010 Remove incorrect documentation stating iterator_facade and iterator_a…	2016-12-01 08:53:05 -05:00
Edward Diener	11e3715f37	Updated to use unique_ptr instead of auto_ptr when appropriate. Removed unnecessary structs.	2016-11-07 14:01:19 -05:00
Rene Rivera	f2d07f76b5	Add, and update, documentation build targets.	2016-10-10 11:39:50 -05:00
Rene Rivera	53e8ac401f	Add, and update, documentation build targets.	2016-10-07 23:07:34 -05:00
Nathan Wilson	434818cce7	Remove incorrect documentation stating iterator_facade and iterator_adapter had been accepted into the TR1. Fixes #8010	2016-01-27 22:22:55 -06:00
nekko1119	c09c8ca2b2	Support lambda expressions in function_input_iterator	2015-12-28 02:45:49 +09:00
Edward Diener	22dd100dfd	Revert "Remove unused deprecated includes" This reverts commit `b2b9ab1568`.	2015-10-15 23:55:35 -04:00
Edward Diener	2f72016049	Revert "Fix test compilation" This reverts commit `443dfb9901`.	2015-10-15 23:53:37 -04:00
Edward Diener	5b26a8b3fc	Merge branch 'develop'	2015-10-14 23:59:55 -04:00
Edward Diener	711a0232f8	Merge pull request #19 from MarcelRaad/patch-1 Fix test compilation	2015-09-22 18:03:05 -07:00
Marcel Raad	443dfb9901	Fix test compilation boost/iterator.hpp was implicitly dragged in via boost/operators.hpp, from which it was removed in `cb6500161b`. It's not needed anyway, all it does is map boost::iterator to std::iterator.	2015-09-22 00:33:50 +02:00
Edward Diener	c734f3bfa3	Merge pull request #18 from MarcelRaad/remove-deprecated-includes Remove deprecated includes	2015-09-14 12:06:20 -04:00
Marcel Raad	b2b9ab1568	Remove unused deprecated includes A comment in boost/iterator.hpp and boost/detail/iterator.hpp mentions that the files are obsolete and will be deprecated. All they do is pull some types from namespace std into namespace boost.	2015-09-14 14:28:38 +02:00
Edward Diener	8b23342969	Merge pull request #17 from boostorg/revert-16-remove-deprecated-includes Revert "Remove unused deprecated includes"	2015-09-14 08:17:35 -04:00
Edward Diener	922296f8c8	Revert "Remove unused deprecated includes"	2015-09-14 08:16:43 -04:00
Edward Diener	c9a91a1fba	Merge pull request #16 from MarcelRaad/remove-deprecated-includes Remove unused deprecated includes	2015-09-14 08:08:53 -04:00
Marcel Raad	80e6f4a3bf	Remove unused deprecated includes A comment in boost/iterator.hpp and boost/detail/iterator.hpp mentions that the files are obsolete and will be deprecated. All they do is pull some types from namespace std into namespace boost.	2015-09-14 10:57:16 +02:00
Edward Diener	398bbe63bb	Updated quickbook docs just fix problems exposed by upgrading to quickbook 1.6	2015-08-24 12:49:59 -04:00
Edward Diener	87d82527b1	Updated zip iterator abstract adds information about the iterator 'tuple'.	2015-08-24 07:18:03 -04:00
Edward Diener	b9448b5fae	Updated with an explanation of the new 'tuple' type for a zip_iterator based on Boost fusion sequences.	2015-08-24 00:24:09 -04:00
Edward Diener	76519ea4a7	Merge branch 'Flast-pr/zip_iterator/fusionize' into develop	2015-08-23 23:56:13 -04:00
Edward Diener	878812c42f	More tests with fusion sequence as tuple	2015-08-23 23:46:44 -04:00
Edward Diener	2283f084d9	Merge pull request #2 from Flast/pr/zip_iterator/fusionize Fusion based zip_iterator, close #7526	2015-08-23 23:37:38 -04:00
Edward Diener	a0533d97f5	Merge branch 'pr/zip_iterator/fusionize' of https://github.com/Flast/iterator into Flast-pr/zip_iterator/fusionize	2015-08-21 22:09:37 -04:00
Edward Diener	ece225bbda	Merge branch 'develop'	2015-07-18 22:08:52 -04:00
Edward Diener	b62dc6ba9d	Remove unneeded header file for undefines.	2015-05-22 00:54:44 -04:00
Edward Diener	20dc7b1abe	Merge pull request #14 from eldiener/develop Changed needed for type_traits version2 to remove icexxx.hpp dependencies.	2015-05-21 23:28:00 -04:00
Edward Diener	0dbbb61bec	Put back MPL auxiliary lambda support.	2015-05-21 23:15:31 -04:00
Edward Diener	2de2111db2	Remove dependency on deprecated type_traits headers.	2015-05-21 23:14:42 -04:00
Edward Diener	db04fafe21	Merge pull request #12 from Lastique/patch-1 Remove unused pure_traversal_tag import into boost::iterators::detail	2015-05-21 16:52:07 -04:00
Edward Diener	4e0fc90b60	Merge pull request #11 from jzmaddock/patch-1 Update is_lvalue_iterator.hpp	2015-05-21 16:35:38 -04:00
Andrey Semashev	53cbba6c09	Remove unused name import As Boost.Range has been updated, there is no need to import pure_traversal_tag into boost::iterators::detail.	2015-01-26 00:02:36 +03:00
jzmaddock	8be623d733	Update is_lvalue_iterator.hpp	2015-01-22 08:48:25 +00:00
jzmaddock	d12d60fa12	Update is_lvalue_iterator.hpp In the current type_traits rewrite, type_traits headers no long implicitly include mpl ones, so mpl/bool.hpp has to be explicitly included now.	2015-01-21 16:54:54 +00:00
Noel Belcourt	ec7d398578	Merge pull request #10 from Flast/pr/ref-to-ref/dr106 Avoid 'reference to reference' error with strict C++03 compiler. While I can't reproduce the error you describe, the patch looks good and it tested okay with Clang 6.0 on Mac and gcc-4.9.1 on Linux. Thanks for the patch.	2014-11-02 15:59:02 -07:00
Kohei Takahashi	3d3560c12d	Avoid 'reference to reference' error in C++03. Some (strict) C++03 compilers (e.g. `gcc -std=c++03`) reject 'reference-to-reference' in the template and typedef which described in CWG DR106 [1]. In such situations, iterator_facade rejects reference type as a value type and some special iterators will become ill-formed: the test libs/range/test/join.hpp might be descriptive. [1] http://www.open-std.org/Jtc1/sc22/wg21/docs/cwg_defects.html#106 Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-09-29 14:58:40 +09:00
Noel Belcourt	46f9e1753f	Merge pull request #9 from boostorg/develop Merge develop into master Tested with gcc-4.2.1 on Darwin.	2014-09-06 11:18:28 -06:00
Kohei Takahashi	2511f21d62	Merge upstream branch 'develop' into pr/zip_iterator/fusionize	2014-08-25 00:36:36 +09:00
Noel Belcourt	adee905c51	Merge pull request #8 from Lastique/add_docs Add docs for iterator category and traversal manipulation tools. Thanks Andrey.	2014-08-23 16:14:52 -06:00
Andrey Semashev	82779f78ec	Added docs for iterator category and traversal manipulation tools.	2014-08-24 01:55:25 +04:00
Noel Belcourt	a569c97969	Merge pull request #6 from Lastique/publish-details Publish some of the implementation details Tested with clang-5.1 on darwin.	2014-08-23 14:08:11 -06:00
Noel Belcourt	aad821d28d	Merge pull request #7 from danieljames/metadata Create metadata file.	2014-08-23 13:53:06 -06:00
Daniel James	23934d7c0d	Add metadata file.	2014-08-18 15:00:20 +01:00
Andrey Semashev	1073b7f7bc	Adjustments for compatibility with commit `48dfb68045`.	2014-07-30 23:00:35 +04:00
Andrey Semashev	f158dba6ad	Moved minimum_category to the public namespace. Added tests.	2014-07-19 21:39:49 +04:00
Andrey Semashev	8fe632d6b1	Copied minimum_category.hpp to public headers.	2014-07-19 21:03:11 +04:00
Andrey Semashev	810b58cfb0	Moved pure_traversal_tag to public namespace. Also added an import into the boost::detail namespace for backward compatibility with Boost.Range. Added a pure_iterator_traversal metafunction that automatically converts iterator category as well.	2014-07-19 20:57:42 +04:00
Kohei Takahashi	156c13a494	Merge upstream branch 'develop' into pr/zip_iterator/fusionize Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-07-12 15:57:03 +09:00
Noel Belcourt	785680d929	Merge pull request #5 from Lastique/adl-protect Moved most components of the library to iterators:: namespace. Thanks Andrey.	2014-07-10 11:33:50 -06:00
Andrey Semashev	269de2691a	Added a workaround for boost/token_iteratpr.hpp which uses an implementation detail of this library.	2014-07-07 22:22:28 +04:00
Kohei Takahashi	11f7d1bc18	Merge upstream branch 'develop' into pr/zip_iterator/fusionize Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-07-03 21:52:26 +09:00
Andrey Semashev	4a403cd3eb	Trim spaces.	2014-07-03 00:36:44 +04:00
Andrey Semashev	dc96d371fa	Moved most components of the library to iterators:: namespace. This change excludes boost:: and boost::detail:: namespaces from ADL for unqualified function calls (e.g. algorithms). This reduces the possibility of name clashes with other libraries and user's code. One of the effects should be fixing test failures on gcc 4.2 and 4.4 due to clashed with Boost.TypeTraits. Also some of the functions marked with inline keyword.	2014-07-03 00:22:45 +04:00
Noel Belcourt	e000b676cc	Merge pull request #4 from Lastique/sfinae-based-operators Make iterator operators conditionally defined depending on its category. Looks okay and fixes several known problems, thanks Andrey.	2014-06-30 16:49:53 -06:00
Daniel James	045a05f81f	Run generator_iterator_test.cpp I accidentally removed it in `8e5b8025d8`.	2014-06-30 10:59:03 +01:00
Daniel James	25139e1311	Remove operator_brackets_dispatch.hpp I should have removed it in `8e5b8025d8`.	2014-06-30 10:53:35 +01:00
Kohei Takahashi	aad767ed3f	Merge upstream branch 'develop' into pr/zip_iterator/fusionize	2014-06-30 11:13:38 +09:00
Andrey Semashev	7fa65a4278	Made iterator operators conditionally defined depending on its category. This makes iterators defined using iterator_facade more friendly to type inspection and fixes its use with next()/prior() since commit `651a869d4f`. The arithmetic, indexing and relational operators are only defined if the iterator category or traversal permits that. Note that the implementation requires partial template specialization support now.	2014-06-30 00:05:38 +04:00
Andrey Semashev	fd94cc7d78	Removed executable flags from docs, tests and examples.	2014-06-29 15:49:05 +04:00
Andrey Semashev	36988fcf98	Removed executable flags from headers.	2014-06-29 15:42:47 +04:00
Daniel James	91f782ec52	Merge branch 'feature/remove-old-compiler-support' into develop	2014-06-26 11:46:39 +01:00
Kohei Takahashi	9841d87212	Add tests for fusion based zip_iterator Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-06-14 15:59:31 +09:00
Kohei Takahashi	782313db8c	Remove unnecessary specialization Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-06-14 15:59:31 +09:00
Kohei Takahashi	c040d4c38b	make_zip_iterator should be inlined Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-06-14 15:59:31 +09:00
Kohei Takahashi	1ddaca8297	zip_iterator specialization for std::pair Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-06-14 15:59:31 +09:00
Kohei Takahashi	acf9b4d4cf	Reimplement zip_iterator based on Boost.Fusion By default, backward compatibility for Boost.Tuple is presented. Signed-off-by: Kohei Takahashi <flast@flast.jp>	2014-06-12 01:05:36 +09:00
Daniel James	e88b3f475c	Remove the the broken compiler notes. Now that the workarounds have been removed, they no longer apply.	2014-06-06 23:03:04 +01:00
Daniel James	01cffbed98	Rebuild iterator_traits.html using latest docutils.	2014-06-06 23:03:04 +01:00
Daniel James	187bc896f6	BOOST_ITERATOR_CATEGORY shouldn't be removed. Since it was documented, it should be kept for backwards compatiblity.	2014-06-06 23:03:03 +01:00
Stephen Kelly	6883d083d2	Iterator: Remove obsolete MSVC version checks. [SVN r86082] Conflicts: include/boost/iterator/iterator_facade.hpp	2014-06-06 23:03:03 +01:00
Stephen Kelly	0345db959b	Remove use of BOOST_ITERATOR_CATEGORY [SVN r86056]	2014-06-06 23:03:03 +01:00
Stephen Kelly	d814423414	Iterator: Remove obsolete GCC version check. [SVN r86055]	2014-06-06 23:03:03 +01:00
Stephen Kelly	eb288b2908	Iterator: Remove use of eti baseclass workaround. [SVN r85940]	2014-06-06 23:03:03 +01:00