Release 1.53.0

[SVN r82734]
2026-01-25 17:52:08 +00:00 · 2013-02-04 18:11:49 +00:00
103 changed files with 542 additions and 2293 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -18,11 +18,7 @@ using boostbook ;

 doxygen autodoc 
    : 
-        [ glob ../../../boost/algorithm/*.hpp 
-               ../../../boost/algorithm/searching/*.hpp
-               ../../../boost/algorithm/cxx11/*.hpp
-               ../../../boost/algorithm/cxx14/*.hpp
-        ]
+        [ glob ../../../boost/algorithm/*.hpp ../../../boost/algorithm/searching/*.hpp ]
    : 
       <doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\""
       <doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile.
--- a/doc/algorithm.qbk
+++ b/doc/algorithm.qbk
@@ -53,18 +53,11 @@ Thanks to all the people who have reviewed this library and made suggestions for
 [include one_of.qbk]
 [include ordered-hpp.qbk]
 [include is_partitioned.qbk]
-[include is_permutation.qbk]
 [include partition_point.qbk]
 [endsect]

-[section:CXX14 C++14 Algorithms]
-[include equal.qbk]
-[include mismatch.qbk]
-[endsect]
-
 [section:Misc Other Algorithms]
 [include clamp-hpp.qbk]
-[include gather.qbk]
 [include hex.qbk]
 [endsect]

--- a/doc/equal.qbk
+++ b/doc/equal.qbk
@@ -1,80 +0,0 @@
-[/ File equal.qbk]
-
-[section:equal equal ]
-
-[/license
-Copyright (c) 2013 Marshall Clow
-
-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)
-]
-
-The header file 'equal.hpp' contains two variants of a the stl algorithm `equal`. The algorithm tests to see if two sequences contain equal values;  
-
-Before (the proposed) C++14 the algorithm `std::equal` took three iterators and an optional comparison predicate. The first two iterators `[first1, last1)` defined a sequence, and the second one `first2` defined the start of the second sequence. The second sequence was assumed to be the same length as the first. 
-
-In C++14, two new variants were introduced, taking four iterators and an optional comparison predicate. The four iterators define two sequences `[first1, last1)` and `[first2, last2)` explicitly, rather than defining the second one implicitly. This leads to correct answers in more cases (and avoid undefined behavior in others).
-
-Consider the two sequences:
-```
-	auto seq1 = { 0, 1, 2 };
-	auto seq2 = { 0, 1, 2, 3, 4 };
-	
-	std::equal ( seq1.begin (), seq1.end (), seq2.begin ()); // true
-	std::equal ( seq2.begin (), seq2.end (), seq1.begin ()); // Undefined behavior
-	std::equal ( seq1.begin (), seq1.end (), seq2.begin (), seq2.end ()); // false
-```
-
-You can argue that `true` is the correct answer in the first case, even though the sequences are not the same. The first N entries in `seq2` are the same as the entries in `seq1` - but that's not all that's in `seq2`. But in the second case, the algorithm will read past the end of `seq1`, resulting in undefined behavior (large earthquake, incorrect results, pregnant cat, etc).
-
-However, if the two sequences are specified completely, it's clear that they are not equal.
-
-[heading interface]
-
-The function `equal` returns true if the two sequences compare equal; i.e, if each element in the sequence compares equal to the corresponding element in the other sequence. One version uses `std::equal_to` to do the comparison; the other lets the caller pass predicate to do the comparisons. 
-
-``
-template <class InputIterator1, class InputIterator2>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2 );
-             
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred );
-``
-
-[heading Examples]
-
-Given the container `c1` containing `{ 0, 1, 2, 3, 14, 15 }`, and `c2` containing `{ 1, 2, 3 }`,  then
-``
-equal ( c1.begin (),     c1.end (),       c2.begin (), c2.end ()) --> false
-equal ( c1.begin () + 1, c1.begin () + 3, c2.begin (), c2.end ()) --> true
-equal ( c1.end (),       c1.end (),       c2.end (),   c2.end ()) --> true  // empty sequences are alway equal to each other
-``
-
-[heading Iterator Requirements]
-
-`equal` works on all iterators except output iterators.
-
-[heading Complexity]
-
-Both of the variants of `equal` run in ['O(N)] (linear) time; that is, they compare against each element in the list once. If the sequence is found to be not equal at any point, the routine will terminate immediately, without examining the rest of the elements.
-
-[heading Exception Safety]
-
-Both of the variants of `equal` take their parameters by value and do not depend upon any global state. Therefore, all the routines in this file provide the strong exception guarantee.
-
-[heading Notes]
-
-* The four iterator version of the routine `equal` is part of the C++14 standard. When C++14 standard library implementations become available, the implementation from the standard library should be used.
-
-* `equal` returns true for two empty ranges, no matter what predicate is passed to test against. 
-
-[endsect]
-
-[/ File equal.qbk
-Copyright 2011 Marshall Clow
-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).
-]
-
--- a/doc/gather.qbk
+++ b/doc/gather.qbk
@@ -1,79 +0,0 @@
-[/ File gather.qbk]
-
-[section:gather gather]
-
-[/license
-Copyright (c) 2013 Marshall Clow
-
-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)
-]
-
-The header file 'boost/algorithm/gather.hpp' contains two variants of a single algorithm, `gather`. 
-
-`gather()` takes a collection of elements defined by a pair of iterators and moves the ones satisfying a predicate to them to a position (called the pivot) within the sequence. The algorithm is stable. The result is a pair of iterators that contains the items that satisfy the predicate.
-
-[heading Interface]
-
-The function `gather` returns a `std::pair` of iterators that denote the elements that satisfy the predicate.  
-
-There are two versions; one takes two iterators, and the other takes a range.
-
-``
-namespace boost { namespace algorithm {
-
-template <typename BidirectionalIterator, typename Pred>
-std::pair<BidirectionalIterator,BidirectionalIterator> 
-gather ( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred );
-
-template <typename BidirectionalRange, typename Pred>
-std::pair<typename boost::range_iterator<const BidirectionalRange>::type, typename boost::range_iterator<const BidirectionalRange>::type>
-gather ( const BidirectionalRange &range, typename boost::range_iterator<const BidirectionalRange>::type pivot, Pred pred );
-
-}}
-``
-
-[heading Examples]
-
-Given an sequence containing:
-``
-0 1 2 3 4 5 6 7 8 9
-``
-
-a call to gather ( arr, arr + 10, arr + 4, IsEven ) will result in:
-
-``
-1 3 0 2 4 6 8 5 7 9
-    |---|-----|
-  first |  second
-      pivot
-``
-where `first` and `second` are the fields of the pair that is returned by the call.
-
-
-[heading Iterator Requirements]
-
-`gather` work on bidirectional iterators or better. This requirement comes from the usage of `stable_partition`, which requires bidirectional iterators. Some standard libraries (libstdc++ and libc++, for example) have implementations of `stable_partition` that work with forward iterators. If that is the case, then `gather` will work with forward iterators as well.
-
-[heading Storage Requirements]
-
-`gather` uses `stable_partition`, which will attempt to allocate temporary memory, but will work in-situ if there is none available.
-
-[heading Complexity]
-
-If there is sufficient memory available, the run time is linear: `O(N)`
-
-If there is not any memory available, then the run time is `O(N log N)`.
-
-[heading Exception Safety]
-
-[heading Notes]
-
-[endsect]
-
-[/ File gather.qbk
-Copyright 2013 Marshall Clow
-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).
-]
-
--- a/doc/is_partitioned.qbk
+++ b/doc/is_partitioned.qbk
@@ -18,7 +18,7 @@ The routine `is_partitioned` takes a sequence and a predicate. It returns true i

 [heading interface]

-The function `is_partitioned` returns true if the items in the sequence are separated according to their ability to satisfy the predicate.  There are two versions; one takes two iterators, and the other takes a range.
+The function `is_partitioned` returns true the items in the sequence are separated according to their ability to satisfy the predicate.  There are two versions; one takes two iterators, and the other takes a range.

 ``
 template<typename InputIterator, typename Predicate>
--- a/doc/is_permutation.qbk
+++ b/doc/is_permutation.qbk
@@ -1,87 +0,0 @@
-[/ File is_permutation.qbk]
-
-[section:is_permutation is_permutation ]
-
-[/license
-Copyright (c) 2010-2012 Marshall Clow
-
-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)
-]
-
-The header file 'is_permutation.hpp' contains six variants of a single algorithm, `is_permutation`. The algorithm tests to see if one sequence is a permutation of a second one; in other words, it contains all the same members, possibly in a different order.
-
-The routine `is_permutation` takes two sequences and an (optional) predicate. It returns true if the two sequences contain the same members. If it is passed a predicate, it uses the predicate to compare the elements of the sequence to see if they are the same.
-
-`is_permutation` come in three forms. The first one takes two iterators to define the first range, and the starting iterator of the second range. The second form takes a two iterators to define the first range and two more to define the second range. The third form takes a single range parameter, and uses Boost.Range to traverse it.
-
-
-[heading Interface]
-
-The function `is_permutation` returns true if the two input sequences contain the same elements.  There are six versions; two take three iterators, two take four iterators, and the other two take two ranges.
-
-In general, you should prefer the four iterator versions over the three iterator ones. The three iterator version has to "create" the fourth iterator internally by calling `std::advance(first2, std::distance(first1,last1))`, and if the second sequence is shorter than the first, that's undefined behavior.
-
-``
-template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2 );
-
-template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
-                      ForwardIterator2 first2, BinaryPredicate p );
-
-
-template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2, ForwardIterator2 last2 );
-
-template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
-                      ForwardIterator2 first2, ForwardIterator2 last2,
-                      BinaryPredicate p );
-
-template <typename Range, typename ForwardIterator>
-bool is_permutation ( const Range &r, ForwardIterator first2 );
-
-template <typename Range, typename ForwardIterator, typename BinaryPredicate>
-bool is_permutation ( const Range &r, ForwardIterator first2, BinaryPredicate pred );
-
-``
-
-[heading Examples]
-
-Given the container `c1` containing `{ 0, 1, 2, 3, 14, 15 }`, and `c2` containing `{ 15, 14, 3, 1, 2 }`, then
-``
-is_permutation ( c1.begin(),     c1.end (), c2.begin(), c2.end ()) --> false
-is_permutation ( c1.begin() + 1, c1.end (), c2.begin(), c2.end ()) --> true
-
-is_permutation ( c1.end (), c1.end (), c2.end(), c2.end ()) --> true  // all empty ranges are permutations of each other
-``
-
-[heading Iterator Requirements]
-
-`is_permutation` works on forward iterators or better. 
-
-[heading Complexity]
-
-All of the variants of `is_permutation` run in ['O(N^2)] (quadratic) time; that is, they compare against each element in the list (potentially) N times.  If passed random-access iterators, `is_permutation` can return quickly if the sequences are different sizes.
-
-[heading Exception Safety]
-
-All of the variants of `is_permutation` take their parameters by value, and do not depend upon any global state. Therefore, all the routines in this file provide the strong exception guarantee.
-
-[heading Notes]
-
-* The three iterator versions of the routine `is_permutation` are part of the C++11 standard. When compiled using a C++11 implementation, the implementation from the standard library will be used.
-
-* The four iterator versions of the routine `is_permutation` are part of the proposed C++14 standard. When C++14 standard libraries become available, the implementation should be changed to use the implementation from the standard library (if available).
-
-* `is_permutation` returns true when passed a pair of empty ranges, no matter what predicate is passed to test with. 
-
-[endsect]
-
-[/ File is_permutation.qbk
-Copyright 2011 Marshall Clow
-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).
-]
-
--- a/doc/mismatch.qbk
+++ b/doc/mismatch.qbk
@@ -1,82 +0,0 @@
-[/ File mismatch.qbk]
-
-[section:mismatch mismatch ]
-
-[/license
-Copyright (c) 2013 Marshall Clow
-
-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)
-]
-
-The header file 'mismatch.hpp' contains two variants of a the stl algorithm `mismatch`. The algorithm finds the first point in two sequences where they do not match.
-
-Before (the proposed) C++14 the algorithm `std::mismatch` took three iterators and an optional comparison predicate. The first two iterators `[first1, last1)` defined a sequence, and the second one `first2` defined the start of the second sequence. The second sequence was assumed to be the same length as the first. 
-
-In C++14, two new variants were introduced, taking four iterators and an optional comparison predicate. The four iterators define two sequences `[first1, last1)` and `[first2, last2)` explicitly, rather than defining the second one implicitly. This leads to correct answers in more cases (and avoid undefined behavior in others).
-
-Consider the two sequences:
-```
-	auto seq1 = { 0, 1, 2 };
-	auto seq2 = { 0, 1, 2, 3, 4 };
-	
-	std::mismatch ( seq1.begin (), seq1.end (), seq2.begin ()); // <3, 3>
-	std::mismatch ( seq2.begin (), seq2.end (), seq1.begin ()); // Undefined behavior
-	std::mismatch ( seq1.begin (), seq1.end (), seq2.begin (), seq2.end ()); // <3, 3>
-```
-
-The first N entries in `seq2` are the same as the entries in `seq1` - but that's not all that's in `seq2`. In the second case, the algorithm will read past the end of `seq1`, resulting in undefined behavior (large earthquake, incorrect results, pregnant cat, etc).
-
-However, if the two sequences are specified completely, it's clear that where the mismatch occurs.
-
-[heading interface]
-
-The function `mismatch` returns a pair of iterators which denote the first mismatching elements in each sequence. If the sequences match completely, `mismatch` returns their end iterators. One version uses `std::equal_to` to do the comparison; the other lets the caller pass predicate to do the comparisons. 
-
-``
-template <class InputIterator1, class InputIterator2>
-std::pair<InputIterator1, InputIterator2>
-mismatch ( InputIterator1 first1, InputIterator1 last1, 
-           InputIterator2 first2, InputIterator2 last2 );
-             
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-std::pair<InputIterator1, InputIterator2>
-mismatch ( InputIterator1 first1, InputIterator1 last1, 
-           InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred );
-``
-
-[heading Examples]
-
-Given the container `c1` containing `{ 0, 1, 2, 3, 14, 15 }`, and `c2` containing `{ 1, 2, 3 }`,  then
-``
-mismatch ( c1.begin(),     c1.end(),       c2.begin(), c2.end()) --> <c1.begin(), c2.begin()> // first elements do not match
-mismatch ( c1.begin() + 1, c1.begin() + 4, c2.begin(), c2.end()) --> <c1.begin() + 4, c2.end ()> // all elements of `c2` match
-mismatch ( c1.end(),       c1.end(),       c2.end(),   c2.end()) --> <c1.end(), c2.end()> // empty sequences don't match at the end.
-``
-
-[heading Iterator Requirements]
-
-`mismatch` works on all iterators except output iterators.
-
-[heading Complexity]
-
-Both of the variants of `mismatch` run in ['O(N)] (linear) time; that is, they compare against each element in the list once. If the sequence is found to be not equal at any point, the routine will terminate immediately, without examining the rest of the elements.
-
-[heading Exception Safety]
-
-Both of the variants of `mismatch` take their parameters by value and do not depend upon any global state. Therefore, all the routines in this file provide the strong exception guarantee.
-
-[heading Notes]
-
-* If the sequences are equal (or both are empty), then mismatch returns the end iterators of both sequences. 
-
-* The four iterator version of the routine `mismatch` is part of the C++14 standard. When C++14 standard library implementations become available, the implementation from the standard library should be used.
-
-[endsect]
-
-[/ File mismatch.qbk
-Copyright 2011 Marshall Clow
-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).
-]
-
--- a/doc/one_of.qbk
+++ b/doc/one_of.qbk
@@ -75,7 +75,7 @@ All of the variants of `one_of` and `one_of_equal` take their parameters by valu

 * `one_of` and `one_of_equal` both return false for empty ranges, no matter what is passed to test against. 

-* The second parameter to `one_of_equal` is a template parameter, rather than deduced from the first parameter (`std::iterator_traits<InputIterator>::value_type`) because that allows more flexibility for callers, and takes advantage of built-in comparisons for the type that is pointed to by the iterator.  The function is defined to return true if, for one element in the sequence, the expression `*iter == val` evaluates to true (where `iter` is an iterator to each element in the sequence)
+* The second parameter to `one_of_value` is a template parameter, rather than deduced from the first parameter (`std::iterator_traits<InputIterator>::value_type`) because that allows more flexibility for callers, and takes advantage of built-in comparisons for the type that is pointed to by the iterator.  The function is defined to return true if, for one element in the sequence, the expression `*iter == val` evaluates to true (where `iter` is an iterator to each element in the sequence)

 [endsect]

--- a/doc/ordered-hpp.qbk
+++ b/doc/ordered-hpp.qbk
@@ -19,11 +19,11 @@ The function `is_sorted(sequence)` determines whether or not a sequence is compl

 ``
 namespace boost { namespace algorithm {
-	template <typename ForwardIterator, typename Pred>
-	bool is_sorted ( ForwardIterator first, ForwardIterator last, Pred p );
+	template <typename Iterator, typename Pred>
+	bool is_sorted ( Iterator first, Iterator last, Pred p );
 	
-	template <typename ForwardIterator>
-	bool is_sorted ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_sorted ( Iterator first, Iterator last );
 	
 	
 	template <typename Range, typename Pred>
@@ -34,7 +34,7 @@ namespace boost { namespace algorithm {
 }}
 ``

-Iterator requirements: The `is_sorted` functions will work forward iterators or better.
+Iterator requirements: The `is_sorted` functions will work on all kinds of iterators (except output iterators). 

 [heading is_sorted_until]

@@ -88,8 +88,8 @@ To test if a sequence is decreasing (each element no larger than the preceding o

 ``
 namespace boost { namespace algorithm {
-	template <typename ForwardIterator>
-	bool is_decreasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_decreasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_decreasing ( const R &range );
@@ -99,8 +99,8 @@ namespace boost { namespace algorithm {
 To test if a sequence is strictly increasing (each element larger than the preceding one):
 ``
 namespace boost { namespace algorithm {
-	template <typename ForwardIterator>
-	bool is_strictly_increasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_strictly_increasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_strictly_increasing ( const R &range );
@@ -110,8 +110,8 @@ namespace boost { namespace algorithm {
 To test if a sequence is strictly decreasing (each element smaller than the preceding one):
 ``
 namespace boost { namespace algorithm {
-	template <typename ForwardIterator>
-	bool is_strictly_decreasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_strictly_decreasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_strictly_decreasing ( const R &range );
--- a/include/boost/algorithm/algorithm.hpp
+++ b/include/boost/algorithm/algorithm.hpp
@@ -1,86 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2014.
-
-   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)
-
- Revision history:
-    2 Dec 2014 mtc First version; power
-   
-*/
-
-/// \file algorithm.hpp
-/// \brief Misc Algorithms
-/// \author Marshall Clow
-///
-
-#ifndef BOOST_ALGORITHM_HPP
-#define BOOST_ALGORITHM_HPP
-
-#include <boost/utility/enable_if.hpp> // for boost::disable_if
-#include <boost/type_traits/is_integral.hpp>
-
-namespace boost { namespace algorithm {
-
-template <typename T>
-T identity_operation ( std::multiplies<T> ) { return T(1); }
-
-template <typename T>
-T identity_operation ( std::plus<T> ) { return T(0); }
-
-
-/// \fn power ( T x, Integer n )
-/// \return the value "x" raised to the power "n"
-/// 
-/// \param x     The value to be exponentiated
-/// \param n     The exponent (must be >= 0)
-///
-//  \remark Taken from Knuth, The Art of Computer Programming, Volume 2:
-//  Seminumerical Algorithms, Section 4.6.3
-template <typename T, typename Integer>
-typename boost::enable_if<boost::is_integral<Integer>, T>::type
-power (T x, Integer n) {
-    T y = 1; // Should be "T y{1};" 
-    if (n == 0) return y;
-    while (true) {
-        if (n % 2 == 1) {
-            y = x * y;
-            if (n == 1)
-                return y;
-            }
-        n = n / 2;
-        x = x * x;
-        }
-    return y;
-    }
-
-/// \fn power ( T x, Integer n, Operation op )
-/// \return the value "x" raised to the power "n"
-/// using the operaton "op".
-/// 
-/// \param x     The value to be exponentiated
-/// \param n     The exponent (must be >= 0)
-/// \param op    The operation used
-///
-//  \remark Taken from Knuth, The Art of Computer Programming, Volume 2:
-//  Seminumerical Algorithms, Section 4.6.3
-template <typename T, typename Integer, typename Operation>
-typename boost::enable_if<boost::is_integral<Integer>, T>::type
-power (T x, Integer n, Operation op) {
-    T y = identity_operation(op);
-    if (n == 0) return y;
-    while (true) {
-        if (n % 2 == 1) {
-            y = op(x, y);
-            if (n == 1)
-                return y;
-            }
-        n = n / 2;
-        x = op(x, x);
-        }
-    return y;
-    }
-
-}}
-
-#endif // BOOST_ALGORITHM_HPP
--- a/include/boost/algorithm/clamp.hpp
+++ b/include/boost/algorithm/clamp.hpp
@@ -31,8 +31,8 @@
 namespace boost { namespace algorithm {

 /// \fn clamp ( T const& val, 
-///               typename boost::mpl::identity<T>::type const & lo, 
-///               typename boost::mpl::identity<T>::type const & hi, Pred p )
+///               typename boost::mpl::identity<T>::type const& lo, 
+///               typename boost::mpl::identity<T>::type const& hi, Pred p )
 /// \return the value "val" brought into the range [ lo, hi ]
 ///     using the comparison predicate p.
 ///     If p ( val, lo ) return lo.
@@ -56,8 +56,8 @@ namespace boost { namespace algorithm {


 /// \fn clamp ( T const& val, 
-///               typename boost::mpl::identity<T>::type const & lo, 
-///               typename boost::mpl::identity<T>::type const & hi )
+///               typename boost::mpl::identity<T>::type const& lo, 
+///               typename boost::mpl::identity<T>::type const& hi )
 /// \return the value "val" brought into the range [ lo, hi ].
 ///     If the value is less than lo, return lo.
 ///     If the value is greater than "hi", return hi.
@@ -76,8 +76,8 @@ namespace boost { namespace algorithm {
  } 

 /// \fn clamp_range ( InputIterator first, InputIterator last, OutputIterator out, 
-///       std::iterator_traits<InputIterator>::value_type const & lo, 
-///       std::iterator_traits<InputIterator>::value_type const & hi )
+///       std::iterator_traits<InputIterator>::value_type lo, 
+///       std::iterator_traits<InputIterator>::value_type hi )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 /// 
 /// \param first The start of the range of values
@@ -88,8 +88,8 @@ namespace boost { namespace algorithm {
 ///
  template<typename InputIterator, typename OutputIterator> 
  OutputIterator clamp_range ( InputIterator first, InputIterator last, OutputIterator out,
-    typename std::iterator_traits<InputIterator>::value_type const & lo, 
-    typename std::iterator_traits<InputIterator>::value_type const & hi )
+    typename std::iterator_traits<InputIterator>::value_type lo, 
+    typename std::iterator_traits<InputIterator>::value_type hi )
  {
  // this could also be written with bind and std::transform
    while ( first != last )
@@ -98,8 +98,8 @@ namespace boost { namespace algorithm {
  } 

 /// \fn clamp_range ( const Range &r, OutputIterator out, 
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo,
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi )
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 /// 
 /// \param r     The range of values to be clamped
@@ -110,16 +110,16 @@ namespace boost { namespace algorithm {
  template<typename Range, typename OutputIterator> 
  typename boost::disable_if_c<boost::is_same<Range, OutputIterator>::value, OutputIterator>::type
  clamp_range ( const Range &r, OutputIterator out,
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo, 
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi )
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo, 
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi )
  {
    return clamp_range ( boost::begin ( r ), boost::end ( r ), out, lo, hi );
  } 


 /// \fn clamp_range ( InputIterator first, InputIterator last, OutputIterator out, 
-///       std::iterator_traits<InputIterator>::value_type const & lo, 
-///       std::iterator_traits<InputIterator>::value_type const & hi, Pred p )
+///       std::iterator_traits<InputIterator>::value_type lo, 
+///       std::iterator_traits<InputIterator>::value_type hi, Pred p )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 ///     using the comparison predicate p.
 /// 
@@ -134,8 +134,8 @@ namespace boost { namespace algorithm {
 ///
  template<typename InputIterator, typename OutputIterator, typename Pred> 
  OutputIterator clamp_range ( InputIterator first, InputIterator last, OutputIterator out,
-    typename std::iterator_traits<InputIterator>::value_type const & lo, 
-    typename std::iterator_traits<InputIterator>::value_type const & hi, Pred p )
+    typename std::iterator_traits<InputIterator>::value_type lo, 
+    typename std::iterator_traits<InputIterator>::value_type hi, Pred p )
  {
  // this could also be written with bind and std::transform
    while ( first != last )
@@ -144,8 +144,8 @@ namespace boost { namespace algorithm {
  } 

 /// \fn clamp_range ( const Range &r, OutputIterator out, 
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo,
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi,
 ///       Pred p )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 ///     using the comparison predicate p.
@@ -162,8 +162,8 @@ namespace boost { namespace algorithm {
  template<typename Range, typename OutputIterator, typename Pred> 
  typename boost::disable_if_c<boost::is_same<Range, OutputIterator>::value, OutputIterator>::type
  clamp_range ( const Range &r, OutputIterator out,
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo, 
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi,
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo, 
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi,
    Pred p )
  {
    return clamp_range ( boost::begin ( r ), boost::end ( r ), out, lo, hi, p );
--- a/include/boost/algorithm/cxx11/all_of.hpp
+++ b/include/boost/algorithm/cxx11/all_of.hpp
@@ -18,6 +18,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of all_of if it is available
+using std::all_of;      // Section 25.2.1
+#else
 /// \fn all_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if all elements in [first, last) satisfy the predicate 'p'
 /// \note returns true on an empty range
@@ -37,6 +41,7 @@ bool all_of ( InputIterator first, InputIterator last, Predicate p )
            return false;
    return true; 
 } 
+#endif

 /// \fn all_of ( const Range &r, Predicate p )
 /// \return true if all elements in the range satisfy the predicate 'p'
--- a/include/boost/algorithm/cxx11/any_of.hpp
+++ b/include/boost/algorithm/cxx11/any_of.hpp
@@ -20,6 +20,10 @@

 namespace boost { namespace algorithm {

+//  Use the C++11 versions of any_of if it is available
+#if __cplusplus >= 201103L
+using std::any_of;      // Section 25.2.2
+#else
 /// \fn any_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if any of the elements in [first, last) satisfy the predicate
 /// \note returns false on an empty range
@@ -36,6 +40,7 @@ bool any_of ( InputIterator first, InputIterator last, Predicate p )
            return true;
    return false; 
 } 
+#endif

 /// \fn any_of ( const Range &r, Predicate p )
 /// \return true if any elements in the range satisfy the predicate 'p'
--- a/include/boost/algorithm/cxx11/copy_if.hpp
+++ b/include/boost/algorithm/cxx11/copy_if.hpp
@@ -18,6 +18,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of copy_if if it is available
+using std::copy_if;         // Section 25.3.1
+#else
 /// \fn copy_if ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 /// \brief Copies all the elements from the input range that satisfy the
 /// predicate to the output range.
@@ -38,6 +42,7 @@ OutputIterator copy_if ( InputIterator first, InputIterator last, OutputIterator
            *result++ = *first;
    return result;
 }
+#endif

 /// \fn copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \brief Copies all the elements from the input range that satisfy the
@@ -58,7 +63,7 @@ OutputIterator copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \fn copy_while ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 /// \brief Copies all the elements at the start of the input range that
 ///     satisfy the predicate to the output range.
-/// \return The updated input and output iterators
+/// \return The updated output iterator
 /// 
 /// \param first    The start of the input sequence
 /// \param last     One past the end of the input sequence
@@ -66,26 +71,25 @@ OutputIterator copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename InputIterator, typename OutputIterator, typename Predicate> 
-std::pair<InputIterator, OutputIterator>
-copy_while ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
+OutputIterator copy_while ( InputIterator first, InputIterator last, 
+                                OutputIterator result, Predicate p )
 {
    for ( ; first != last && p(*first); ++first )
        *result++ = *first;
-    return std::make_pair(first, result);
+    return result;
 }

 /// \fn copy_while ( const Range &r, OutputIterator result, Predicate p )
 /// \brief Copies all the elements at the start of the input range that
 ///     satisfy the predicate to the output range.
-/// \return The updated input and output iterators
+/// \return The updated output iterator
 /// 
 /// \param r        The input range
 /// \param result   An output iterator to write the results into
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename Range, typename OutputIterator, typename Predicate>
-std::pair<typename boost::range_iterator<const Range>::type, OutputIterator> 
-copy_while ( const Range &r, OutputIterator result, Predicate p )
+OutputIterator copy_while ( const Range &r, OutputIterator result, Predicate p )
 {
    return boost::algorithm::copy_while (boost::begin (r), boost::end(r), result, p);
 }
@@ -102,12 +106,11 @@ copy_while ( const Range &r, OutputIterator result, Predicate p )
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename InputIterator, typename OutputIterator, typename Predicate> 
-std::pair<InputIterator, OutputIterator>
-copy_until ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
+OutputIterator copy_until ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 {
    for ( ; first != last && !p(*first); ++first )
        *result++ = *first;
-    return std::make_pair(first, result);
+    return result;
 }

 /// \fn copy_until ( const Range &r, OutputIterator result, Predicate p )
@@ -120,8 +123,7 @@ copy_until ( InputIterator first, InputIterator last, OutputIterator result, Pre
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename Range, typename OutputIterator, typename Predicate>
-std::pair<typename boost::range_iterator<const Range>::type, OutputIterator> 
-copy_until ( const Range &r, OutputIterator result, Predicate p )
+OutputIterator copy_until ( const Range &r, OutputIterator result, Predicate p )
 {
    return boost::algorithm::copy_until (boost::begin (r), boost::end(r), result, p);
 }
--- a/include/boost/algorithm/cxx11/copy_n.hpp
+++ b/include/boost/algorithm/cxx11/copy_n.hpp
@@ -16,6 +16,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of copy_n if it is available
+using std::copy_n;          // Section 25.3.1
+#else
 /// \fn copy_n ( InputIterator first, Size n, OutputIterator result )
 /// \brief Copies exactly n (n > 0) elements from the range starting at first to
 ///     the range starting at result.
@@ -34,6 +38,7 @@ OutputIterator copy_n ( InputIterator first, Size n, OutputIterator result )
        *result = *first;
    return result;
 }
+#endif
 }} // namespace boost and algorithm

 #endif  // BOOST_ALGORITHM_COPY_IF_HPP
--- a/include/boost/algorithm/cxx11/find_if_not.hpp
+++ b/include/boost/algorithm/cxx11/find_if_not.hpp
@@ -19,6 +19,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of find_if_not if it is available
+using std::find_if_not;      // Section 25.2.5
+#else
 /// \fn find_if_not(InputIterator first, InputIterator last, Predicate p)
 /// \brief Finds the first element in the sequence that does not satisfy the predicate.
 /// \return         The iterator pointing to the desired element.
@@ -37,6 +41,7 @@ InputIterator find_if_not ( InputIterator first, InputIterator last, Predicate p
            break;
    return first;
 }
+#endif

 /// \fn find_if_not ( const Range &r, Predicate p )
 /// \brief Finds the first element in the sequence that does not satisfy the predicate.
--- a/include/boost/algorithm/cxx11/iota.hpp
+++ b/include/boost/algorithm/cxx11/iota.hpp
@@ -19,6 +19,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of iota if it is available
+using std::iota;      // Section 26.7.6
+#else
 /// \fn iota ( ForwardIterator first, ForwardIterator last, T value )
 /// \brief Generates an increasing sequence of values, and stores them in [first, last)
 /// 
@@ -34,6 +38,7 @@ void iota ( ForwardIterator first, ForwardIterator last, T value )
    for ( ; first != last; ++first, ++value )
        *first = value;
 }
+#endif

 /// \fn iota ( Range &r, T value )
 /// \brief Generates an increasing sequence of values, and stores them in the input Range.
@@ -58,8 +63,8 @@ void iota ( Range &r, T value )
 template <typename OutputIterator, typename T>
 OutputIterator iota_n ( OutputIterator out, T value, std::size_t n )
 {
-    for ( ; n > 0; --n, ++value )
-        *out++ = value;
+    while ( n-- > 0 )
+        *out++ = value++;

    return out;
 }
--- a/include/boost/algorithm/cxx11/is_partitioned.hpp
+++ b/include/boost/algorithm/cxx11/is_partitioned.hpp
@@ -19,6 +19,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of is_partitioned if it is available
+using std::is_partitioned;      // Section 25.3.13
+#else
 /// \fn is_partitioned ( InputIterator first, InputIterator last, UnaryPredicate p )
 /// \brief Tests to see if a sequence is partitioned according to a predicate
 /// 
@@ -41,6 +45,7 @@ bool is_partitioned ( InputIterator first, InputIterator last, UnaryPredicate p
            return false;
    return true;
 }
+#endif

 /// \fn is_partitioned ( const Range &r, UnaryPredicate p )
 /// \brief Generates an increasing sequence of values, and stores them in the input Range.
--- a/include/boost/algorithm/cxx11/is_permutation.hpp
+++ b/include/boost/algorithm/cxx11/is_permutation.hpp
@@ -9,8 +9,8 @@
 /// \brief Is a sequence a permutation of another sequence
 /// \author Marshall Clow

-#ifndef BOOST_ALGORITHM_IS_PERMUTATION11_HPP
-#define BOOST_ALGORITHM_IS_PERMUTATION11_HPP
+#ifndef BOOST_ALGORITHM_IS_PERMUTATION_HPP
+#define BOOST_ALGORITHM_IS_PERMUTATION_HPP

 #include <algorithm>    // for std::less, tie, mismatch and is_permutation (if available)
 #include <utility>      // for std::make_pair
@@ -21,9 +21,14 @@
 #include <boost/range/end.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/tr1/tr1/tuple>      // for tie

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of is_permutation if it is available
+using std::is_permutation;              // Section 25.2.12
+#else
 /// \cond DOXYGEN_HIDE
 namespace detail {
    template <typename Predicate, typename Iterator>
@@ -33,77 +38,18 @@ namespace detail {
        template <typename T1>
        bool operator () ( const T1 &t1 ) const { return p_ ( *it_, t1 ); }
    private:
-        Predicate p_;
+        Predicate &p_;
        Iterator it_;
        };
-        
-//  Preconditions:
-//  1. The sequences are the same length
-//  2. Any common elements on the front have been removed (not necessary for correctness, just for performance)
-    template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-    bool is_permutation_inner ( ForwardIterator1 first1, ForwardIterator1 last1,
-                                ForwardIterator2 first2, ForwardIterator2 last2,
-                                BinaryPredicate p ) {
-        //  for each unique value in the sequence [first1,last1), count how many times
-        //  it occurs, and make sure it occurs the same number of times in [first2, last2)
-            for ( ForwardIterator1 iter = first1; iter != last1; ++iter ) {
-                value_predicate<BinaryPredicate, ForwardIterator1> pred ( p, iter );
-
-            /*  For each value we haven't seen yet... */
-                if ( std::find_if ( first1, iter, pred ) == iter ) {
-                    std::size_t dest_count = std::count_if ( first2, last2, pred );
-                    if ( dest_count == 0 || dest_count != (std::size_t) std::count_if ( iter, last1, pred ))
-                        return false;
-                    }
-                }
-
-        return true;
-        }                      
-
-    template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool is_permutation_tag ( ForwardIterator1 first1, ForwardIterator1 last1, 
-                          ForwardIterator2 first2, ForwardIterator2 last2, 
-                          BinaryPredicate p,
-                          std::forward_iterator_tag, std::forward_iterator_tag ) {
-
-    //  Skip the common prefix (if any)
-        while ( first1 != last1 && first2 != last2 && p ( *first1, *first2 )) {
-            ++first1;
-            ++first2;
-            }
-        if ( first1 != last1 && first2 != last2 )
-            return boost::algorithm::detail::is_permutation_inner ( first1, last1, first2, last2,
-                std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
-        return first1 == last1 && first2 == last2;
-        }
-
-    template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
-    bool is_permutation_tag ( RandomAccessIterator1 first1, RandomAccessIterator1 last1, 
-                          RandomAccessIterator2 first2, RandomAccessIterator2 last2, 
-                          BinaryPredicate p,
-                          std::random_access_iterator_tag, std::random_access_iterator_tag ) {
-    //  Cheap check
-        if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
-            return false;
-    //  Skip the common prefix (if any)
-        while ( first1 != last1 && first2 != last2 && p ( *first1, *first2 )) {
-            ++first1;
-            ++first2;
-            }
-
-        if ( first1 != last1 && first2 != last2 )
-            return is_permutation_inner (first1, last1, first2, last2, p);
-        return first1 == last1 && first2 == last2;
-        }
-
 }
 /// \endcond

+
 /// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2, BinaryPredicate p )
 /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
 ///
-/// \param first1   The start of the input sequence
-/// \param last1    One past the end of the input sequence
+/// \param first    The start of the input sequence
+/// \param last     One past the end of the input sequence
 /// \param first2   The start of the second sequence
 /// \param p        The predicate to compare elements with
 ///
@@ -115,6 +61,7 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
                      ForwardIterator2 first2, BinaryPredicate p )
 {
 //  Skip the common prefix (if any)
+//  std::tie (first1, first2) = std::mismatch (first1, last1, first2, p);
    std::pair<ForwardIterator1, ForwardIterator2> eq = std::mismatch (first1, last1, first2, p);
    first1 = eq.first;
    first2 = eq.second;
@@ -122,7 +69,19 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
    //  Create last2
        ForwardIterator2 last2 = first2;
        std::advance ( last2, std::distance (first1, last1));
-        return boost::algorithm::detail::is_permutation_inner ( first1, last1, first2, last2, p );
+
+    //  for each unique value in the sequence [first1,last1), count how many times
+    //  it occurs, and make sure it occurs the same number of times in [first2, last2)
+        for ( ForwardIterator1 iter = first1; iter != last1; ++iter ) {
+            detail::value_predicate<BinaryPredicate, ForwardIterator1> pred ( p, iter );
+
+        /*  For each value we haven't seen yet... */
+            if ( std::find_if ( first1, iter, pred ) == iter ) {
+                std::size_t dest_count = std::count_if ( first2, last2, pred );
+                if ( dest_count == 0 || dest_count != (std::size_t) std::count_if ( iter, last1, pred ))
+                    return false;
+                }
+            }
        }

    return true;
@@ -131,31 +90,22 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
 /// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 )
 /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
 ///
-/// \param first1   The start of the input sequence
-/// \param last2    One past the end of the input sequence
+/// \param first    The start of the input sequence
+/// \param last     One past the end of the input sequence
 /// \param first2   The start of the second sequence
 /// \note           This function is part of the C++2011 standard library.
 ///  We will use the standard one if it is available,
 ///     otherwise we have our own implementation.
 template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2 )
+bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 )
 {
 //  How should I deal with the idea that ForwardIterator1::value_type
 //  and ForwardIterator2::value_type could be different? Define my own comparison predicate?
-//  Skip the common prefix (if any)
-    std::pair<ForwardIterator1, ForwardIterator2> eq = std::mismatch (first1, last1, first2 );
-    first1 = eq.first;
-    first2 = eq.second;
-    if ( first1 != last1 ) {
-    //  Create last2
-        ForwardIterator2 last2 = first2;
-        std::advance ( last2, std::distance (first1, last1));
-        return boost::algorithm::detail::is_permutation_inner ( first1, last1, first2, last2,
-            std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
-        }
-    return true;
+    return boost::algorithm::is_permutation ( first, last, first2,
+                          std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
 }

+#endif

 /// \fn is_permutation ( const Range &r, ForwardIterator first2 )
 /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
@@ -186,4 +136,4 @@ is_permutation ( const Range &r, ForwardIterator first2, BinaryPredicate pred )

 }}

-#endif  // BOOST_ALGORITHM_IS_PERMUTATION11_HPP
+#endif  // BOOST_ALGORITHM_IS_PERMUTATION_HPP
--- a/include/boost/algorithm/cxx11/is_sorted.hpp
+++ b/include/boost/algorithm/cxx11/is_sorted.hpp
@@ -26,6 +26,11 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of is_sorted/is_sorted_until if they are available
+using std::is_sorted_until; // Section 25.4.1.5
+using std::is_sorted;       // Section 25.4.1.5
+#else
 /// \fn is_sorted_until ( ForwardIterator first, ForwardIterator last, Pred p )
 /// \return the point in the sequence [first, last) where the elements are unordered
 ///     (according to the comparison predicate 'p').
@@ -86,6 +91,7 @@ namespace boost { namespace algorithm {
    {
        return boost::algorithm::is_sorted_until (first, last) == last;
    }
+#endif

 ///
 /// -- Range based versions of the C++11 functions
--- a/include/boost/algorithm/cxx11/none_of.hpp
+++ b/include/boost/algorithm/cxx11/none_of.hpp
@@ -18,6 +18,10 @@

 namespace boost { namespace algorithm {

+//  Use the C++11 versions of the none_of if it is available
+#if __cplusplus >= 201103L
+using std::none_of;     // Section 25.2.3
+#else
 /// \fn none_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if none of the elements in [first, last) satisfy the predicate 'p'
 /// \note returns true on an empty range
@@ -34,6 +38,7 @@ for ( ; first != last; ++first )
        return false;
    return true;
 } 
+#endif

 /// \fn none_of ( const Range &r, Predicate p )
 /// \return true if none of the elements in the range satisfy the predicate 'p'
--- a/include/boost/algorithm/cxx11/partition_copy.hpp
+++ b/include/boost/algorithm/cxx11/partition_copy.hpp
@@ -20,6 +20,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of partition_copy if it is available
+using std::partition_copy;  // Section 25.3.13
+#else
 /// \fn partition_copy ( InputIterator first, InputIterator last,
 ///     OutputIterator1 out_true, OutputIterator2 out_false, UnaryPredicate p )
 /// \brief Copies the elements that satisfy the predicate p from the range [first, last) 
@@ -49,6 +53,7 @@ partition_copy ( InputIterator first, InputIterator last,
            *out_false++ = *first;
    return std::pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
 }
+#endif

 /// \fn partition_copy ( const Range &r, 
 ///     OutputIterator1 out_true, OutputIterator2 out_false, UnaryPredicate p )
--- a/include/boost/algorithm/cxx11/partition_point.hpp
+++ b/include/boost/algorithm/cxx11/partition_point.hpp
@@ -19,6 +19,10 @@

 namespace boost { namespace algorithm {

+#if __cplusplus >= 201103L
+//  Use the C++11 versions of partition_point if it is available
+using std::partition_point;      // Section 25.3.13
+#else
 /// \fn partition_point ( ForwardIterator first, ForwardIterator last, Predicate p )
 /// \brief Given a partitioned range, returns the partition point, i.e, the first element 
 ///     that does not satisfy p
@@ -48,6 +52,7 @@ ForwardIterator partition_point ( ForwardIterator first, ForwardIterator last, P
        }
    return first;
 }
+#endif

 /// \fn partition_point ( Range &r, Predicate p )
 /// \brief Given a partitioned range, returns the partition point
@@ -56,7 +61,7 @@ ForwardIterator partition_point ( ForwardIterator first, ForwardIterator last, P
 /// \param p        The predicate to test the values with
 ///
 template <typename Range, typename Predicate>
-typename boost::range_iterator<Range>::type partition_point ( Range &r, Predicate p )
+typename boost::range_iterator<Range> partition_point ( Range &r, Predicate p )
 {
    return boost::algorithm::partition_point (boost::begin(r), boost::end(r), p);
 }
--- a/include/boost/algorithm/cxx14/equal.hpp
+++ b/include/boost/algorithm/cxx14/equal.hpp
@@ -1,97 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2008-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)
-*/
-
-/// \file  equal.hpp
-/// \brief Test ranges to if they are equal
-/// \author Marshall Clow
-
-#ifndef BOOST_ALGORITHM_EQUAL_HPP
-#define BOOST_ALGORITHM_EQUAL_HPP
-
-#include <algorithm>    // for std::equal
-#include <functional>   // for std::equal_to
-
-namespace boost { namespace algorithm {
-
-namespace detail {
-
-    template <class T1, class T2>
-    struct eq : public std::binary_function<T1, T2, bool> {
-        bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;}
-        };
-    
-    template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
-    bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1, 
-                 RandomAccessIterator2 first2, RandomAccessIterator2 last2, BinaryPredicate pred,
-                 std::random_access_iterator_tag, std::random_access_iterator_tag )
-    {
-    //  Random-access iterators let is check the sizes in constant time
-        if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
-            return false;
-    // If we know that the sequences are the same size, the original version is fine
-        return std::equal ( first1, last1, first2, pred );
-    }
-
-    template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    bool equal ( InputIterator1 first1, InputIterator1 last1, 
-                 InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred,
-                 std::input_iterator_tag, std::input_iterator_tag )
-    {
-    for (; first1 != last1 && first2 != last2; ++first1, ++first2 )
-        if ( !pred(*first1, *first2 ))
-            return false;
-
-    return first1 == last1 && first2 == last2;
-    }
-}
-
-/// \fn equal ( InputIterator1 first1, InputIterator1 last1, 
-///             InputIterator2 first2, InputIterator2 last2,
-///             BinaryPredicate pred )
-/// \return true if all elements in the two ranges are equal
-/// 
-/// \param first1    The start of the first range.
-/// \param last1     One past the end of the first range.
-/// \param first2    The start of the second range.
-/// \param last2     One past the end of the second range.
-/// \param pred      A predicate for comparing the elements of the ranges
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred )
-{
-    return boost::algorithm::detail::equal ( 
-        first1, last1, first2, last2, pred,
-        typename std::iterator_traits<InputIterator1>::iterator_category (),
-        typename std::iterator_traits<InputIterator2>::iterator_category ());
-}
-
-/// \fn equal ( InputIterator1 first1, InputIterator1 last1, 
-///             InputIterator2 first2, InputIterator2 last2 )
-/// \return true if all elements in the two ranges are equal
-/// 
-/// \param first1    The start of the first range.
-/// \param last1     One past the end of the first range.
-/// \param first2    The start of the second range.
-/// \param last2     One past the end of the second range.
-template <class InputIterator1, class InputIterator2>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2 )
-{
-    return boost::algorithm::detail::equal (
-        first1, last1, first2, last2,
-        boost::algorithm::detail::eq<
-            typename std::iterator_traits<InputIterator1>::value_type,
-            typename std::iterator_traits<InputIterator2>::value_type> (),
-        typename std::iterator_traits<InputIterator1>::iterator_category (),
-        typename std::iterator_traits<InputIterator2>::iterator_category ());
-}
-
-//  There are already range-based versions of these.
-
-}} // namespace boost and algorithm
-
-#endif // BOOST_ALGORITHM_EQUAL_HPP
--- a/include/boost/algorithm/cxx14/is_permutation.hpp
+++ b/include/boost/algorithm/cxx14/is_permutation.hpp
@@ -1,84 +0,0 @@
-/*
-   Copyright (c) Marshall Clow 2014.
-
-   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)
-*/
-
-/// \file  is_permutation.hpp
-/// \brief Is a sequence a permutation of another sequence (four iterator versions)
-/// \author Marshall Clow
-
-#ifndef BOOST_ALGORITHM_IS_PERMUTATION14_HPP
-#define BOOST_ALGORITHM_IS_PERMUTATION14_HPP
-
-#include <algorithm>    // for std::less, tie, mismatch and is_permutation (if available)
-#include <utility>      // for std::make_pair
-#include <functional>   // for std::equal_to
-#include <iterator>
-
-#include <boost/algorithm/cxx11/is_permutation.hpp>
-#include <boost/algorithm/cxx14/mismatch.hpp>
-
-namespace boost { namespace algorithm {
-
-/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, 
-///                      ForwardIterator2 first2, ForwardIterator2 last2 )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
-///
-/// \param first1   The start of the input sequence
-/// \param last2    One past the end of the input sequence
-/// \param first2   The start of the second sequence
-/// \param last1    One past the end of the second sequence
-/// \note           This function is part of the C++2014 standard library.
-///  We will use the standard one if it is available,
-///     otherwise we have our own implementation.
-template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, 
-                      ForwardIterator2 first2, ForwardIterator2 last2 )
-{
-//  How should I deal with the idea that ForwardIterator1::value_type
-//  and ForwardIterator2::value_type could be different? Define my own comparison predicate?
-    std::pair<ForwardIterator1, ForwardIterator2> eq = boost::algorithm::mismatch
-        ( first1, last1, first2, last2 );
-    if ( eq.first == last1 && eq.second == last2)
-        return true;
-    return boost::algorithm::detail::is_permutation_tag (
-        eq.first, last1, eq.second, last2, 
-        std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> (),
-        typename std::iterator_traits<ForwardIterator1>::iterator_category (),
-        typename std::iterator_traits<ForwardIterator2>::iterator_category ());
-}
-
-/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, 
-///                      ForwardIterator2 first2, ForwardIterator2 last2, 
-///                      BinaryPredicate p )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
-///
-/// \param first1   The start of the input sequence
-/// \param last1    One past the end of the input sequence
-/// \param first2   The start of the second sequence
-/// \param last2    One past the end of the second sequence
-/// \param pred     The predicate to compare elements with
-///
-/// \note           This function is part of the C++2014 standard library.
-///  We will use the standard one if it is available,
-///     otherwise we have our own implementation.
-template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
-                      ForwardIterator2 first2, ForwardIterator2 last2, 
-                      BinaryPredicate pred )
-{
-    std::pair<ForwardIterator1, ForwardIterator2> eq = boost::algorithm::mismatch
-        ( first1, last1, first2, last2, pred );
-    if ( eq.first == last1 && eq.second == last2)
-        return true;
-    return boost::algorithm::detail::is_permutation_tag (
-        first1, last1, first2, last2, pred, 
-        typename std::iterator_traits<ForwardIterator1>::iterator_category (),
-        typename std::iterator_traits<ForwardIterator2>::iterator_category ());
-}
-
-}}
-
-#endif  // BOOST_ALGORITHM_IS_PERMUTATION14_HPP
--- a/include/boost/algorithm/cxx14/mismatch.hpp
+++ b/include/boost/algorithm/cxx14/mismatch.hpp
@@ -1,65 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2008-2012.
-
-   Distributed under the Boost Software License, Version 1.0. (See accompanying
-   file LICENSE10.txt or copy at http://www.boost.org/LICENSE10.txt)
-*/
-
-/// \file  mismatch.hpp
-/// \brief Find the first mismatched element in a sequence
-/// \author Marshall Clow
-
-#ifndef BOOST_ALGORITHM_MISMATCH_HPP
-#define BOOST_ALGORITHM_MISMATCH_HPP
-
-#include <algorithm>    // for std::mismatch
-#include <utility>      // for std::pair
-
-namespace boost { namespace algorithm {
-
-/// \fn mismatch ( InputIterator1 first1, InputIterator1 last1, 
-///                InputIterator2 first2, InputIterator2 last2,
-///                BinaryPredicate pred )
-/// \return a pair of iterators pointing to the first elements in the sequence that do not match
-/// 
-/// \param first1    The start of the first range.
-/// \param last1     One past the end of the first range.
-/// \param first2    The start of the second range.
-/// \param last2     One past the end of the second range.
-/// \param pred      A predicate for comparing the elements of the ranges
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-std::pair<InputIterator1, InputIterator2> mismatch (
-                    InputIterator1 first1, InputIterator1 last1,
-                    InputIterator2 first2, InputIterator2 last2,
-                    BinaryPredicate pred )
-{
-    for (; first1 != last1 && first2 != last2; ++first1, ++first2)
-        if ( !pred ( *first1, *first2 ))
-            break;
-    return std::pair<InputIterator1, InputIterator2>(first1, first2);
-}
-
-/// \fn mismatch ( InputIterator1 first1, InputIterator1 last1, 
-///                InputIterator2 first2, InputIterator2 last2 )
-/// \return a pair of iterators pointing to the first elements in the sequence that do not match
-/// 
-/// \param first1    The start of the first range.
-/// \param last1     One past the end of the first range.
-/// \param first2    The start of the second range.
-/// \param last2     One past the end of the second range.
-template <class InputIterator1, class InputIterator2>
-std::pair<InputIterator1, InputIterator2> mismatch (
-                    InputIterator1 first1, InputIterator1 last1,
-                    InputIterator2 first2, InputIterator2 last2 )
-{
-    for (; first1 != last1 && first2 != last2; ++first1, ++first2)
-        if ( *first1 != *first2 )
-            break;
-    return std::pair<InputIterator1, InputIterator2>(first1, first2);
-}
-
-//  There are already range-based versions of these.
-
-}} // namespace boost and algorithm
-
-#endif // BOOST_ALGORITHM_MISMATCH_HPP
--- a/include/boost/algorithm/gather.hpp
+++ b/include/boost/algorithm/gather.hpp
@@ -1,123 +0,0 @@
-/* 
-    Copyright 2008 Adobe Systems Incorporated
-
-   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)
-
- Revision history:
-   January 2008 mtc Version for Adobe Source Library
-   January 2013 mtc Version for Boost.Algorithm
-
-*/
-
-/**************************************************************************************************/
-
-/*!
-\author Marshall Clow
-\date    January 2008
-*/
-
-#ifndef BOOST_ALGORITHM_GATHER_HPP
-#define BOOST_ALGORITHM_GATHER_HPP
-
-#include <algorithm>                // for std::stable_partition
-#include <functional>
-
-#include <boost/bind.hpp>           // for boost::bind
-#include <boost/range/begin.hpp>    // for boost::begin(range)
-#include <boost/range/end.hpp>      // for boost::end(range)
-
-
-/**************************************************************************************************/
-/*!
-    \defgroup gather gather
-    \ingroup mutating_algorithm
-
-    \c gather() takes a collection of elements defined by a pair of iterators and moves
-    the ones satisfying a predicate to them to a position (called the pivot) within
-    the sequence. The algorithm is stable. The result is a pair of iterators that
-    contains the items that satisfy the predicate.
-
-    Given an sequence containing:
-    <pre>
-    0 1 2 3 4 5 6 7 8 9
-    </pre>
-
-    a call to gather ( arr, arr + 10, arr + 4, IsEven ()) will result in:
-
-    <pre>
-    1 3 0 2 4 6 8 5 7 9
-        |---|-----|
-      first |  second
-          pivot
-    </pre>
-
-
-    The problem is broken down into two basic steps, namely, moving the items before the pivot
-    and then moving the items from the pivot to the end. These "moves" are done with calls to
-    stable_partition.
-
-    \par Storage Requirements:
-
-    The algorithm uses stable_partition, which will attempt to allocate temporary memory,
-    but will work in-situ if there is none available.
-
-    \par Time Complexity:
-
-    If there is sufficient memory available, the run time is linear in <code>N</code>.
-    If there is not any memory available, then the run time is <code>O(N log N)</code>.
-*/
-
-/**************************************************************************************************/
-
-namespace boost { namespace algorithm {
-
-/**************************************************************************************************/
-
-/*!
-    \ingroup gather
-    \brief iterator-based gather implementation
-*/
-
-template <
-    typename BidirectionalIterator,  // Iter models BidirectionalIterator
-    typename Pred>                   // Pred models UnaryPredicate
-std::pair<BidirectionalIterator, BidirectionalIterator> gather 
-        ( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred )
-{
-//  The first call partitions everything up to (but not including) the pivot element,
-//  while the second call partitions the rest of the sequence.
-    return std::make_pair (
-        std::stable_partition ( first, pivot, !boost::bind<bool> ( pred, _1 )),
-        std::stable_partition ( pivot, last,   boost::bind<bool> ( pred, _1 )));
-}
-
-/**************************************************************************************************/
-
-/*!
-    \ingroup gather
-    \brief range-based gather implementation
-*/
-
-template <
-    typename BidirectionalRange,    //
-    typename Pred>                  // Pred models UnaryPredicate
-std::pair<
-    typename boost::range_iterator<const BidirectionalRange>::type,
-    typename boost::range_iterator<const BidirectionalRange>::type>
-gather (
-    const BidirectionalRange &range,
-    typename boost::range_iterator<const BidirectionalRange>::type pivot,
-    Pred pred )
-{
-    return boost::algorithm::gather ( boost::begin ( range ), boost::end ( range ), pivot, pred );
-}
-
-/**************************************************************************************************/
-
-}}  // namespace
-
-/**************************************************************************************************/
-
-#endif
-
--- a/include/boost/algorithm/hex.hpp
+++ b/include/boost/algorithm/hex.hpp
@@ -10,6 +10,12 @@
 /*
    General problem - turn a sequence of integral types into a sequence of hexadecimal characters.
    - and back.
+
+TO DO:
+    1. these should really only work on integral types. (see the >> and << operations)
+        -- this is done, I think.
+    2. The 'value_type_or_char' struct is really a hack.
+        -- but it's a better hack now that it works with back_insert_iterators
 */

 /// \file  hex.hpp
@@ -36,11 +42,11 @@ namespace boost { namespace algorithm {
 /*! 
    \struct hex_decode_error 
    \brief  Base exception class for all hex decoding errors 
-*/ /*!
+    
    \struct non_hex_input    
    \brief  Thrown when a non-hex value (0-9, A-F) encountered when decoding.
                Contains the offending character
-*/ /*!    
+    
    \struct not_enough_input 
    \brief  Thrown when the input sequence unexpectedly ends
    
@@ -63,16 +69,18 @@ namespace detail {
        return std::copy ( res, res + num_hex_digits, out );
        }

-    template <typename T>
-    unsigned char hex_char_to_int ( T val ) {
-        char c = static_cast<char> ( val );
-        unsigned retval = 0;
-        if      ( c >= '0' && c <= '9' ) retval = c - '0';
-        else if ( c >= 'A' && c <= 'F' ) retval = c - 'A' + 10;
-        else if ( c >= 'a' && c <= 'f' ) retval = c - 'a' + 10;
-        else BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c));
-        return retval;
+// this needs to be in an un-named namespace because it is not a template
+// and might get included in several compilation units. This could cause
+// multiple definition errors at link time.
+    namespace {
+    unsigned hex_char_to_int ( char c ) {
+        if ( c >= '0' && c <= '9' ) return c - '0';
+        if ( c >= 'A' && c <= 'F' ) return c - 'A' + 10;
+        if ( c >= 'a' && c <= 'f' ) return c - 'a' + 10;
+        BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c));
+        return 0;     // keep dumb compilers happy
        }
+    }    

 //  My own iterator_traits class.
 //  It is here so that I can "reach inside" some kinds of output iterators
@@ -126,7 +134,7 @@ namespace detail {
        for ( std::size_t i = 0; i < 2 * sizeof ( T ); ++i, ++first ) {
            if ( pred ( first, last )) 
                BOOST_THROW_EXCEPTION (not_enough_input ());
-            res = ( 16 * res ) + hex_char_to_int (*first);
+            res = ( 16 * res ) + hex_char_to_int (static_cast<char> (*first));
            }
        
        *out = res;
@@ -207,6 +215,7 @@ OutputIterator unhex ( InputIterator first, InputIterator last, OutputIterator o
 /// \note           Based on the MySQL function of the same name
 template <typename T, typename OutputIterator>
 OutputIterator unhex ( const T *ptr, OutputIterator out ) {
+    typedef typename detail::hex_iterator_traits<OutputIterator>::value_type OutputType;
 //  If we run into the terminator while decoding, we will throw a
 //      malformed input exception. It would be nicer to throw a 'Not enough input'
 //      exception - but how much extra work would that require?
--- a/include/boost/algorithm/searching/detail/bm_traits.hpp
+++ b/include/boost/algorithm/searching/detail/bm_traits.hpp
@@ -20,11 +20,7 @@
 #include <boost/type_traits/remove_const.hpp>

 #include <boost/array.hpp>
-#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#include <boost/unordered_map.hpp>
-#else
-#include <unordered_map>
-#endif
+#include <boost/tr1/tr1/unordered_map>

 #include <boost/algorithm/searching/detail/debugging.hpp>

@@ -39,11 +35,7 @@ namespace boost { namespace algorithm { namespace detail {
    template<typename key_type, typename value_type>
    class skip_table<key_type, value_type, false> {
    private:
-#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
-        typedef boost::unordered_map<key_type, value_type> skip_map;
-#else
-        typedef std::unordered_map<key_type, value_type> skip_map;
-#endif
+        typedef std::tr1::unordered_map<key_type, value_type> skip_map;
        const value_type k_default_value;
        skip_map skip_;
        
--- a/include/boost/algorithm/string/concept.hpp
+++ b/include/boost/algorithm/string/concept.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_CONCEPT_HPP

 #include <boost/concept_check.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>

--- a/include/boost/algorithm/string/detail/find_format.hpp
+++ b/include/boost/algorithm/string/detail/find_format.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_FIND_FORMAT_DETAIL_HPP

 #include <boost/algorithm/string/config.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/const_iterator.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/algorithm/string/detail/find_format_store.hpp>
--- a/include/boost/algorithm/string/detail/find_format_all.hpp
+++ b/include/boost/algorithm/string/detail/find_format_all.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP

 #include <boost/algorithm/string/config.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/const_iterator.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/algorithm/string/detail/find_format_store.hpp>
--- a/include/boost/algorithm/string/detail/find_format_store.hpp
+++ b/include/boost/algorithm/string/detail/find_format_store.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP

 #include <boost/algorithm/string/config.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>

 namespace boost {
    namespace algorithm {
--- a/include/boost/algorithm/string/detail/find_iterator.hpp
+++ b/include/boost/algorithm/string/detail/find_iterator.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_FIND_ITERATOR_DETAIL_HPP

 #include <boost/algorithm/string/config.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/function.hpp>
--- a/include/boost/algorithm/string/detail/finder.hpp
+++ b/include/boost/algorithm/string/detail/finder.hpp
@@ -15,7 +15,7 @@
 #include <boost/algorithm/string/constants.hpp>
 #include <boost/detail/iterator.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/empty.hpp>
@@ -142,6 +142,7 @@ namespace boost {
                    ForwardIteratorT End,
                    std::forward_iterator_tag ) const
                {
+                    typedef ForwardIteratorT input_iterator_type;
                    typedef iterator_range<ForwardIteratorT> result_type;

                    first_finder_type first_finder(
@@ -262,6 +263,7 @@ namespace boost {
                    ForwardIteratorT End,
                    unsigned int N) const
                {
+                    typedef ForwardIteratorT input_iterator_type;
                    typedef iterator_range<ForwardIteratorT> result_type;

                    // Sanity check
@@ -296,6 +298,7 @@ namespace boost {
                    ForwardIteratorT End,
                    unsigned int N) const
                {
+                    typedef ForwardIteratorT input_iterator_type;
                    typedef iterator_range<ForwardIteratorT> result_type;

                    // Sanity check
@@ -359,6 +362,7 @@ namespace boost {
                unsigned int N,
                std::random_access_iterator_tag )
            {
+                typedef ForwardIteratorT input_iterator_type;
                typedef iterator_range<ForwardIteratorT> result_type;

                if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
@@ -432,6 +436,7 @@ namespace boost {
                unsigned int N,
                std::random_access_iterator_tag )
            {
+                typedef ForwardIteratorT input_iterator_type;
                typedef iterator_range<ForwardIteratorT> result_type;

                if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
@@ -622,6 +627,8 @@ namespace boost {
                {
 #if BOOST_WORKAROUND( __MWERKS__, <= 0x3003 ) 
                    return iterator_range<const ForwardIterator2T>(this->m_Range);
+#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+                    return iterator_range<ForwardIterator2T>(m_Range.begin(), m_Range.end());
 #else
                    return m_Range;
 #endif
--- a/include/boost/algorithm/string/detail/finder_regex.hpp
+++ b/include/boost/algorithm/string/detail/finder_regex.hpp
@@ -14,7 +14,7 @@
 #include <boost/algorithm/string/config.hpp>
 #include <boost/regex.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>

--- a/include/boost/algorithm/string/detail/formatter.hpp
+++ b/include/boost/algorithm/string/detail/formatter.hpp
@@ -12,7 +12,7 @@
 #define BOOST_STRING_FORMATTER_DETAIL_HPP


-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/const_iterator.hpp>
--- a/include/boost/algorithm/string/detail/util.hpp
+++ b/include/boost/algorithm/string/detail/util.hpp
@@ -13,7 +13,7 @@

 #include <boost/algorithm/string/config.hpp>
 #include <functional>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>

 namespace boost {
    namespace algorithm {
--- a/include/boost/algorithm/string/erase.hpp
+++ b/include/boost/algorithm/string/erase.hpp
@@ -13,7 +13,7 @@

 #include <boost/algorithm/string/config.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/find.hpp
+++ b/include/boost/algorithm/string/find.hpp
@@ -13,7 +13,7 @@

 #include <boost/algorithm/string/config.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/find_format.hpp
+++ b/include/boost/algorithm/string/find_format.hpp
@@ -13,7 +13,7 @@

 #include <deque>
 #include <boost/detail/iterator.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/const_iterator.hpp>
--- a/include/boost/algorithm/string/find_iterator.hpp
+++ b/include/boost/algorithm/string/find_iterator.hpp
@@ -15,7 +15,7 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/iterator_categories.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
@@ -132,7 +132,10 @@ namespace boost {
            // increment
            void increment()
            {
-                m_Match=this->do_find(m_Match.end(),m_End);
+                if(m_Match.begin() == m_Match.end())
+                    m_Match=this->do_find(m_Match.end(),m_End);
+                else
+                    m_Match=this->do_find(m_Match.begin()+1,m_End);
            }

            // comparison
@@ -230,12 +233,7 @@ namespace boost {
    
                \post eof()==true
            */
-            split_iterator() :
-                m_Next(),
-                m_End(),
-                m_bEof(true)
-            {}
-
+            split_iterator() {}
            //! Copy constructor
            /*!
                Construct a copy of the split_iterator
--- a/include/boost/algorithm/string/finder.hpp
+++ b/include/boost/algorithm/string/finder.hpp
@@ -13,7 +13,7 @@

 #include <boost/algorithm/string/config.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/formatter.hpp
+++ b/include/boost/algorithm/string/formatter.hpp
@@ -13,7 +13,7 @@

 #include <boost/detail/iterator.hpp>
 #include <boost/range/value_type.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/detail/formatter.hpp>
--- a/include/boost/algorithm/string/iter_find.hpp
+++ b/include/boost/algorithm/string/iter_find.hpp
@@ -16,7 +16,7 @@
 #include <iterator>
 #include <boost/iterator/transform_iterator.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/predicate.hpp
+++ b/include/boost/algorithm/string/predicate.hpp
@@ -17,7 +17,7 @@
 #include <boost/range/iterator.hpp>
 #include <boost/range/const_iterator.hpp>
 #include <boost/range/as_literal.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>

 #include <boost/algorithm/string/compare.hpp>
 #include <boost/algorithm/string/find.hpp>
--- a/include/boost/algorithm/string/regex.hpp
+++ b/include/boost/algorithm/string/regex.hpp
@@ -14,7 +14,7 @@
 #include <boost/algorithm/string/config.hpp>
 #include <boost/regex.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/replace.hpp
+++ b/include/boost/algorithm/string/replace.hpp
@@ -13,7 +13,7 @@

 #include <boost/algorithm/string/config.hpp>

-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
--- a/include/boost/algorithm/string/sequence_traits.hpp
+++ b/include/boost/algorithm/string/sequence_traits.hpp
@@ -36,6 +36,47 @@ namespace boost {

 //  sequence traits  -----------------------------------------------//

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        //! Native replace tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the container has basic_string like native replace
+            method.
+        */
+        no_type has_native_replace_tester(...);
+
+        //! Stable iterators tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's insert/replace/erase methods do not invalidate
+            existing iterators.
+        */
+        no_type has_stable_iterators_tester(...);
+
+        //! const time insert tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's insert method is working in constant time
+        */
+        no_type has_const_time_insert_tester(...);
+
+        //! const time erase tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's erase method is working in constant time
+        */
+        no_type has_const_time_erase_tester(...);
+
+#endif //BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

        //! Native replace trait
        /*!
@@ -45,12 +86,20 @@ namespace boost {
        class has_native_replace
        {

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_native_replace_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
        public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            enum { value = false };
 #    else
            BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION


            typedef mpl::bool_<has_native_replace<T>::value> type;
@@ -65,12 +114,20 @@ namespace boost {
        template< typename T >
        class has_stable_iterators
        {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_stable_iterators_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
        public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            enum { value = false };
 #    else
            BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

            typedef mpl::bool_<has_stable_iterators<T>::value> type;
        };
@@ -84,12 +141,20 @@ namespace boost {
        template< typename T >
        class has_const_time_insert
        {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_const_time_insert_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
        public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            enum { value = false };
 #    else
            BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

            typedef mpl::bool_<has_const_time_insert<T>::value> type;
        };
@@ -103,12 +168,20 @@ namespace boost {
        template< typename T >
        class has_const_time_erase
        {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_const_time_erase_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
        public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            enum { value = false };
 #    else
            BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

            typedef mpl::bool_<has_const_time_erase<T>::value> type;
        };
--- a/include/boost/algorithm/string/std/list_traits.hpp
+++ b/include/boost/algorithm/string/std/list_traits.hpp
@@ -20,6 +20,22 @@ namespace boost {

 //  std::list<> traits  -----------------------------------------------//

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // stable iterators tester
+        template<typename T, typename AllocT>
+        yes_type has_stable_iterators_tester( const ::std::list<T,AllocT>* );
+
+        // const time insert tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_insert_tester( const ::std::list<T,AllocT>* );
+
+        // const time erase tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_erase_tester( const ::std::list<T,AllocT>* );
+
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

        // stable iterators trait
        template<typename T, typename AllocT>
@@ -59,6 +75,7 @@ namespace boost {
 #endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            typedef mpl::bool_<has_const_time_erase<T>::value> type;
        };
+#endif


    } // namespace algorithm
--- a/include/boost/algorithm/string/std/rope_traits.hpp
+++ b/include/boost/algorithm/string/std/rope_traits.hpp
@@ -20,6 +20,25 @@ namespace boost {

 //  SGI's std::rope<> traits  -----------------------------------------------//

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // native replace tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_native_replace_tester( const std::rope<T, TraitsT, AllocT>* );
+
+        // stable iterators tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_stable_iterators_tester( const std::rope<T, TraitsT, AllocT>* );
+
+        // const time insert tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_const_time_insert_tester( const std::rope<T, TraitsT, AllocT>* );
+
+        // const time erase tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_const_time_erase_tester( const std::rope<T, TraitsT, AllocT>* );
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
    
    // native replace trait
        template<typename T, typename TraitsT, typename AllocT>
@@ -72,6 +91,7 @@ namespace boost {
 #endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            typedef mpl::bool_<value> type;     
        };
+#endif


    } // namespace algorithm
--- a/include/boost/algorithm/string/std/slist_traits.hpp
+++ b/include/boost/algorithm/string/std/slist_traits.hpp
@@ -21,6 +21,21 @@ namespace boost {

 //  SGI's std::slist<> traits  -----------------------------------------------//

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // stable iterators tester
+        template<typename T, typename AllocT>
+        yes_type has_stable_iterators_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+        // const time insert tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_insert_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+        // const time erase tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_erase_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

    // stable iterators trait
        template<typename T, typename AllocT>
@@ -60,6 +75,7 @@ namespace boost {
 #endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
            typedef mpl::bool_<has_const_time_erase<T>::value> type;
        };
+#endif


    } // namespace algorithm
--- a/include/boost/algorithm/string/std/string_traits.hpp
+++ b/include/boost/algorithm/string/std/string_traits.hpp
@@ -20,6 +20,13 @@ namespace boost {

 //  std::basic_string<> traits  -----------------------------------------------//

+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // native replace tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_native_replace_tester( const std::basic_string<T, TraitsT, AllocT>* );
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

    // native replace trait
        template<typename T, typename TraitsT, typename AllocT>
@@ -36,6 +43,7 @@ namespace boost {
        };


+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

    } // namespace algorithm
 } // namespace boost
--- a/include/boost/algorithm/string/trim.hpp
+++ b/include/boost/algorithm/string/trim.hpp
@@ -17,7 +17,7 @@
 #include <boost/range/end.hpp>
 #include <boost/range/const_iterator.hpp>
 #include <boost/range/as_literal.hpp>
-#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/iterator_range.hpp>

 #include <boost/algorithm/string/detail/trim.hpp>
 #include <boost/algorithm/string/classification.hpp>
--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -1,47 +0,0 @@
-[
-    {
-        "key": "algorithm",
-        "name": "Algorithm",
-        "authors": [
-            "Marshall Clow"
-        ],
-        "description": "A collection of useful generic algorithms.",
-        "category": [
-            "Algorithms"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    },
-    {
-        "key": "algorithm/minmax",
-        "name": "Min-Max",
-        "authors": [
-            "Hervé Brönnimann"
-        ],
-        "description": "Standard library extensions for simultaneous min/max and min/max element computations.",
-        "documentation": "minmax/",
-        "category": [
-            "Algorithms"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    },
-    {
-        "key": "algorithm/string",
-        "name": "String Algo",
-        "authors": [
-            "Pavol Droba"
-        ],
-        "description": "String algorithms library.",
-        "documentation": "string/",
-        "category": [
-            "Algorithms",
-            "String"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    }
-]
--- a/minmax/test/Jamfile.v2
+++ b/minmax/test/Jamfile.v2
@@ -9,16 +9,11 @@

 import testing ;

-alias unit_test_framework
-    : # sources
-        /boost//unit_test_framework
-    ;        
-
 {
  test-suite algorithm/minmax:
-   : [ run minmax_element_test.cpp unit_test_framework
+   : [ run minmax_element_test.cpp
       : : : : minmax_element ]
-     [ run minmax_test.cpp unit_test_framework
+     [ run minmax_test.cpp
       : : : : minmax ]      
   ;
 }
--- a/minmax/test/minmax_element_test.cpp
+++ b/minmax/test/minmax_element_test.cpp
@@ -15,11 +15,9 @@

 #include <boost/config.hpp> /* prevents some nasty warns in MSVC */
 #include <boost/algorithm/minmax_element.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>
 #include <boost/iterator/reverse_iterator.hpp>

-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
 class custom {
  int m_x;
  friend bool operator<(custom const& x, custom const& y);
@@ -227,14 +225,17 @@ void test(int n BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value))
  test_range(first, last, n);
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int argc, char* argv[] )
 {
 #ifndef BOOST_NO_STDC_NAMESPACE
  using std::atoi;
 #endif

  int n = 100;
+  if (argc > 1) n = atoi(argv[1]);

  test<int>(n);
  test<custom>(n);
+
+  return 0;
 }
--- a/minmax/test/minmax_test.cpp
+++ b/minmax/test/minmax_test.cpp
@@ -8,9 +8,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/minmax.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 class custom {
  int m_x;
@@ -78,8 +76,10 @@ void test(BOOST_EXPLICIT_TEMPLATE_TYPE(Value))
  BOOST_CHECK_EQUAL( counter, 1);
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test<int>(); // ("builtin");
  test<custom>(); // ("custom ");
+
+  return 0;
 }
--- a/string/test/Jamfile.v2
+++ b/string/test/Jamfile.v2
@@ -9,63 +9,58 @@

 import testing ;

-alias unit_test_framework
-    : # sources
-        /boost//unit_test_framework
-    ;        
-
 test-suite algorithm/string
    : [ run 
-            trim_test.cpp unit_test_framework
+            trim_test.cpp
          : :
            :
            : trim
        ]
      [ run 
-            conv_test.cpp unit_test_framework
+            conv_test.cpp
          : :
            :
            : conv
        ]
      [ run 
-            predicate_test.cpp unit_test_framework
+            predicate_test.cpp
          : :
            :
            : predicate
        ]
      [ run 
-            find_test.cpp unit_test_framework
+            find_test.cpp
          : :
            :
            : find
        ]
      [ run
-            split_test.cpp unit_test_framework
+            split_test.cpp
          : :
            :
            : split
        ]
      [ run
-            join_test.cpp unit_test_framework
+            join_test.cpp
          : :
            :
            : join
        ]
      [ run 
-            replace_test.cpp unit_test_framework
+            replace_test.cpp
          : :
            :
            : replace
        ]
      [ run 
-            regex_test.cpp unit_test_framework
+            regex_test.cpp
            ../../../regex/build//boost_regex
          : :
            :   
            : regex
        ]
      [ run 
-            find_format_test.cpp unit_test_framework
+            find_format_test.cpp
          : :
            :   
            : find_format
--- a/string/test/conv_test.cpp
+++ b/string/test/conv_test.cpp
@@ -10,8 +10,7 @@
 #include <boost/algorithm/string/case_conv.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -88,7 +87,9 @@ void conv_test()
 }

 // test main 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int, char*[] )
 {
    conv_test();
+    
+    return 0;
 }
--- a/string/test/find_format_test.cpp
+++ b/string/test/find_format_test.cpp
@@ -12,8 +12,7 @@
 #include <boost/algorithm/string/formatter.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <boost/test/test_tools.hpp>

@@ -155,8 +154,10 @@ void find_format_all_test()
    BOOST_CHECK_EQUAL(output, source);
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int, char*[] )
 {
    find_format_test();
    find_format_all_test();
+
+    return 0;
 }
--- a/string/test/find_test.cpp
+++ b/string/test/find_test.cpp
@@ -12,8 +12,7 @@
 #include <boost/algorithm/string/split.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -46,7 +45,7 @@ void find_test()


    // find_first
-    BOOST_TEST_CHECKPOINT( "find_first" );
+    BOOST_CHECKPOINT( "find_first" );

    nc_result=find_first( str1, string("abc") );
    BOOST_CHECK( 
@@ -67,7 +66,7 @@ void find_test()
    BOOST_CHECK(( (ch_result.begin() - pch1 ) == 3) && ( (ch_result.end() - pch1 ) == 6 ) );

    // find_last
-    BOOST_TEST_CHECKPOINT( "find_last" );
+    BOOST_CHECKPOINT( "find_last" );
    
    nc_result=find_last( str1, string("abc") );
    BOOST_CHECK( 
@@ -88,7 +87,7 @@ void find_test()
    BOOST_CHECK(( (ch_result.begin() - pch1 ) == 15) && ( (ch_result.end() - pch1 ) == 18 ) );

    // find_nth
-    BOOST_TEST_CHECKPOINT( "find_nth" );
+    BOOST_CHECKPOINT( "find_nth" );

    nc_result=find_nth( str1, string("abc"), 1 );
    BOOST_CHECK( 
@@ -126,7 +125,7 @@ void find_test()
    BOOST_CHECK(( (ch_result.begin() - pch1 ) == 9) && ( (ch_result.end() - pch1 ) == 12 ) );

    // find_head
-    BOOST_TEST_CHECKPOINT( "find_head" );
+    BOOST_CHECKPOINT( "find_head" );

    nc_result=find_head( str1, 6 );
    BOOST_CHECK( 
@@ -147,7 +146,7 @@ void find_test()
    BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 0 ) && ( (ch_result.end() - pch1 ) == 6 ) );

    // find_tail
-    BOOST_TEST_CHECKPOINT( "find_tail" );
+    BOOST_CHECKPOINT( "find_tail" );

    nc_result=find_tail( str1, 6 );
    BOOST_CHECK( 
@@ -169,7 +168,7 @@ void find_test()
    BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 15 ) && ( (ch_result.end() - pch1 ) == 21 ) );

    // find_token
-    BOOST_TEST_CHECKPOINT( "find_token" );
+    BOOST_CHECKPOINT( "find_token" );

    nc_result=find_token( str1, is_any_of("abc"), token_compress_on );
    BOOST_CHECK( 
@@ -181,21 +180,6 @@ void find_test()
        ( (cv_result.begin()-str1.begin()) == 3) &&
        ( (cv_result.end()-str1.begin()) == 6) );

-    string s1("abc def ghi jkl");
-    find_iterator<string::iterator> fEnd;
-
-    find_iterator<string::iterator> fxIt = make_find_iterator(s1,
-            token_finder(is_alnum(), token_compress_on));
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
-    ++fxIt;
-    BOOST_CHECK(fxIt == fEnd);
-
    nc_result=find_token( str1, is_any_of("abc"), token_compress_off );
    BOOST_CHECK( 
        ( (nc_result.begin()-str1.begin()) == 3) &&
@@ -210,7 +194,7 @@ void find_test()
    BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 3 ) && ( (ch_result.end() - pch1 ) == 4 ) );

    // generic find
-    BOOST_TEST_CHECKPOINT( "generic find" );
+    BOOST_CHECKPOINT( "generic find" );

    nc_result=find(str1, first_finder(string("abc")));
    BOOST_CHECK( 
@@ -223,7 +207,7 @@ void find_test()
        ( (cv_result.end()-str1.begin()) == 6) );

    // multi-type comparison test 
-    BOOST_TEST_CHECKPOINT( "multi-type" );
+    BOOST_CHECKPOINT( "multi-type" );

    nc_vresult=find_first( vec1, string("abc") );
    BOOST_CHECK( 
@@ -236,7 +220,7 @@ void find_test()
        ( (cv_result.end()-str1.begin()) == 6) );

    // overflow test
-    BOOST_TEST_CHECKPOINT( "overflow" );
+    BOOST_CHECKPOINT( "overflow" );
    
    nc_result=find_first( str2, string("abcd") );
    BOOST_CHECK( nc_result.begin()==nc_result.end() );
@@ -249,7 +233,7 @@ void find_test()
    BOOST_CHECK( string( cv_result.begin(), cv_result.end() )== string("abc") );

    // Empty string test
-    BOOST_TEST_CHECKPOINT( "empty" );
+    BOOST_CHECKPOINT( "empty" );
    
    nc_result=find_first( str3, string("abcd") );
    BOOST_CHECK( nc_result.begin()==nc_result.end() );
@@ -266,10 +250,25 @@ void find_test()
    osstr << find_first( str1, "abc" );
    BOOST_CHECK( osstr.str()=="abc" );

+    // Empty string test
+    BOOST_CHECKPOINT( "overlapping" );
+    
+    std::string overlap_target("aaaa");
+    std::vector<boost::iterator_range<std::string::iterator> > overlap_results;
+    boost::algorithm::find_all(overlap_results, overlap_target, string("aaa"));
+    BOOST_CHECK( overlap_results.size() == 2 );
+
+    std::string overlap_target2("aaaabbbbaaaa");
+    boost::algorithm::find_all(overlap_results, overlap_target2, string("bb"));
+    BOOST_CHECK( overlap_results.size() == 3 );
+    boost::algorithm::find_all(overlap_results, overlap_target2, string("aa"));
+    BOOST_CHECK( overlap_results.size() == 6 );
 }

 // test main 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int, char*[] )
 {
    find_test();
+    
+    return 0;
 }
--- a/string/test/join_test.cpp
+++ b/string/test/join_test.cpp
@@ -13,8 +13,7 @@
 #include <boost/algorithm/string/predicate.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -71,8 +70,10 @@ void join_test()
    BOOST_CHECK( equals(join_if(tokens3, "-", is_not_empty), "") );
 }

-
-BOOST_AUTO_TEST_CASE( test_main )
+// test main 
+int test_main( int, char*[] )
 {
    join_test();
+    
+    return 0;
 }
--- a/string/test/predicate_test.cpp
+++ b/string/test/predicate_test.cpp
@@ -11,8 +11,7 @@
 #include <boost/algorithm/string/classification.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -153,8 +152,11 @@ void classification_test()

 #undef TEST_CLASS

-BOOST_AUTO_TEST_CASE( test_main )
+// test main 
+int test_main( int, char*[] )
 {
    predicate_test();
    classification_test();
+    
+    return 0;
 }
--- a/string/test/regex_test.cpp
+++ b/string/test/regex_test.cpp
@@ -15,8 +15,7 @@


 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -150,9 +149,11 @@ static void replace_test()
    BOOST_CHECK( str1==string("123AxXxCa23ca456c321") );
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int, char*[] )
 {
    find_test();
    join_test();
    replace_test();
+
+    return 0;
 }
--- a/string/test/replace_test.cpp
+++ b/string/test/replace_test.cpp
@@ -16,8 +16,7 @@
 #include <boost/algorithm/string/classification.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -57,14 +56,14 @@ void sequence_traits_test()
 #define C_ ,
 #define TEST_ALGO( Algo, Input, Params, Output ) \
 {\
-    BOOST_TEST_CHECKPOINT( #Algo " - Copy" );\
+    BOOST_CHECKPOINT( #Algo " - Copy" );\
 \
    string str1(Input);\
 \
    /* Copy test */ \
    BOOST_CHECK( Algo##_copy( str1, Params )==Output );\
 \
-    BOOST_TEST_CHECKPOINT( #Algo " - Iterator" );\
+    BOOST_CHECKPOINT( #Algo " - Iterator" );\
    /* Iterator test */\
    string strout;\
    Algo##_copy( back_inserter(strout), str1, Params );\
@@ -74,15 +73,15 @@ void sequence_traits_test()
    vector<char> vec1( str1.begin(), str1.end() );\
    list<char> list1( str1.begin(), str1.end() );\
 \
-    BOOST_TEST_CHECKPOINT( #Algo " - Inplace(string)" );\
+    BOOST_CHECKPOINT( #Algo " - Inplace(string)" );\
    Algo( str1, Params ); \
    BOOST_CHECK( equals( str1, Output ) ); \
 \
-    BOOST_TEST_CHECKPOINT( #Algo " - Inplace(vector)" );\
+    BOOST_CHECKPOINT( #Algo " - Inplace(vector)" );\
    Algo( vec1, Params ); \
    BOOST_CHECK( equals( vec1, Output ) );\
 \
-    BOOST_TEST_CHECKPOINT( #Algo " - Inplace(list)" );\
+    BOOST_CHECKPOINT( #Algo " - Inplace(list)" );\
    Algo( list1, Params ); \
    BOOST_CHECK( equals( list1, Output ) );\
 }
@@ -207,7 +206,7 @@ void replace_range_test()
 {
    // replace_range
    {
-        BOOST_TEST_CHECKPOINT( "replace_range" );
+        BOOST_CHECKPOINT( "replace_range" );

        string str1("1abc3abc2");
        BOOST_CHECK( 
@@ -232,7 +231,7 @@ void replace_range_test()
    }
    // erase_range
    {
-        BOOST_TEST_CHECKPOINT( "erase_range" );
+        BOOST_CHECKPOINT( "erase_range" );

        string str1("1abc3abc2");
        BOOST_CHECK( 
@@ -306,7 +305,8 @@ void dissect_format_test()

 }

-BOOST_AUTO_TEST_CASE( test_main )
+// test main 
+int test_main( int, char*[] )
 {
    sequence_traits_test(); 
    replace_first_test();
@@ -318,4 +318,6 @@ BOOST_AUTO_TEST_CASE( test_main )
    replace_range_test();
    collection_comp_test();
    dissect_format_test();
+
+    return 0;
 }
--- a/string/test/split_test.cpp
+++ b/string/test/split_test.cpp
@@ -13,12 +13,10 @@
 #include <boost/algorithm/string/predicate.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
-#include <list>
 #include <iostream>

 #include <boost/test/test_tools.hpp>
@@ -46,7 +44,7 @@ void iterator_test()
    const char* pch1="xx-abc--xx-abb";
    vector<string> tokens;
    vector< vector<int> > vtokens;
-    
+
    // find_all tests
    find_all(
        tokens,
@@ -181,13 +179,12 @@ void iterator_test()
    BOOST_CHECK(siter==split_iterator<string::iterator>(siter));
    BOOST_CHECK(siter==split_iterator<string::iterator>());

-//  Make sure we work with forward iterators
-//  See bug #7989
-    list<char> l1;
-    find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
 }

-BOOST_AUTO_TEST_CASE( test_main )
+// test main 
+int test_main( int, char*[] )
 {
    iterator_test();
+    
+    return 0;
 }
--- a/string/test/trim_test.cpp
+++ b/string/test/trim_test.cpp
@@ -11,8 +11,7 @@
 #include <boost/algorithm/string/trim_all.hpp>

 // Include unit test framework
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -194,9 +193,12 @@ void trim_fill_test()
    BOOST_CHECK( trim_fill_copy_if( string("<>abc<>def<>"), "-", is_any_of( "<<>>" ) )=="abc-def" );
 }

-BOOST_AUTO_TEST_CASE( test_main )
+// test main 
+int test_main( int, char*[] )
 {
    trim_test();
    trim_all_test();
    trim_fill_test();
+
+    return 0;
 }
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -9,61 +9,44 @@

 import testing ;

-alias unit_test_framework
-    : # sources
-        /boost//unit_test_framework
-    ;        
-
-
 {
  test-suite algorithm:
 # Search tests
-   : [ run empty_search_test.cpp unit_test_framework      : : : : empty_search_test ]
-     [ run search_test1.cpp unit_test_framework           : : : : search_test1 ]
-     [ run search_test2.cpp unit_test_framework           : : : : search_test2 ]
-     [ run search_test3.cpp unit_test_framework           : : : : search_test3 ]
-     [ run search_test4.cpp unit_test_framework           : : : : search_test4 ]
-     [ compile-fail search_fail1.cpp  : : : : ]
-     [ compile-fail search_fail2.cpp  : : : : ]
-     [ compile-fail search_fail3.cpp  : : : : ]
+   : [ run empty_search_test.cpp     : : : : empty_search_test ]
+     [ run search_test1.cpp          : : : : search_test1 ]
+     [ run search_test2.cpp          : : : : search_test2 ]
+     [ run search_test3.cpp          : : : : search_test3 ]
+     [ run search_test4.cpp          : : : : search_test4 ]
+     [ compile-fail search_fail1.cpp : : : : ]
+     [ compile-fail search_fail2.cpp : : : : ]
+     [ compile-fail search_fail3.cpp : : : : ]

-# Misc tests
-     [ run clamp_test.cpp unit_test_framework         : : : : clamp_test ]
-     [ run power_test.cpp unit_test_framework         : : : : power_test ]
-     [ compile-fail power_fail1.cpp  : : : : ]
+# Clamp tests
+     [ run clamp_test.cpp        : : : : clamp_test ]
   
 # Cxx11 tests
-     [ run all_of_test.cpp unit_test_framework         : : : : all_of_test ]
-     [ run any_of_test.cpp unit_test_framework         : : : : any_of_test ]
-     [ run none_of_test.cpp unit_test_framework        : : : : none_of_test ]
-     [ run one_of_test.cpp unit_test_framework         : : : : one_of_test ]
+     [ run all_of_test.cpp        : : : : all_of_test ]
+     [ run any_of_test.cpp        : : : : any_of_test ]
+     [ run none_of_test.cpp       : : : : none_of_test ]
+     [ run one_of_test.cpp        : : : : one_of_test ]
     
-     [ run ordered_test.cpp unit_test_framework        : : : : ordered_test ]
-     [ run find_if_not_test1.cpp unit_test_framework   : : : : find_if_not_test1 ]
-     [ run copy_if_test1.cpp unit_test_framework        : : : : copy_if_test1 ]
-     [ run copy_n_test1.cpp unit_test_framework       : : : : copy_n_test1 ]
-     [ run iota_test1.cpp unit_test_framework          : : : : iota_test1 ]
+     [ run ordered_test.cpp       : : : : ordered_test ]
+     [ run find_if_not_test1.cpp  : : : : find_if_not_test1 ]
+     [ run copy_if_test1.cpp       : : : : copy_if_test1 ]
+     [ run copy_n_test1.cpp       : : : : copy_n_test1 ]
+     [ run iota_test1.cpp         : : : : iota_test1 ]

-     [ run is_permutation_test1.cpp unit_test_framework         : : : : is_permutation_test1 ]
-     [ run partition_point_test1.cpp unit_test_framework        : : : : partition_point_test1 ]
-     [ run is_partitioned_test1.cpp unit_test_framework         : : : : is_partitioned_test1 ]
-     [ run partition_copy_test1.cpp unit_test_framework         : : : : partition_copy_test1 ]
-
-# Cxx14 tests
-     [ run equal_test.cpp unit_test_framework         : : : : equal_test ]
-     [ run mismatch_test.cpp unit_test_framework      : : : : mismatch_test ]
+     [ run is_permutation_test1.cpp        : : : : is_permutation_test1 ]
+     [ run partition_point_test1.cpp       : : : : partition_point_test1 ]
+     [ run is_partitioned_test1.cpp        : : : : is_partitioned_test1 ]
+     [ run partition_copy_test1.cpp        : : : : partition_copy_test1 ]

 # Hex tests
-     [ run hex_test1.cpp unit_test_framework         : : : : hex_test1 ]
-     [ run hex_test2.cpp unit_test_framework         : : : : hex_test2 ]
-     [ run hex_test3.cpp unit_test_framework         : : : : hex_test3 ]
-     [ run hex_test4.cpp unit_test_framework         : : : : hex_test4 ]
-     [ compile-fail hex_fail1.cpp ]
-
-# Gather tests
-     [ run gather_test1.cpp unit_test_framework        : : : : gather_test1 ]
-     [ compile-fail gather_fail1.cpp ]
-
+     [ run hex_test1.cpp        : : : : hex_test1 ]
+     [ run hex_test2.cpp        : : : : hex_test2 ]
+     [ run hex_test3.cpp        : : : : hex_test3 ]
+     [ run hex_test4.cpp        : : : : hex_test4 ]
+	 [ compile-fail hex_fail1.cpp ]
   ;
 }

--- a/test/all_of_test.cpp
+++ b/test/all_of_test.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/all_of.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <functional>
 #include <vector>
@@ -81,7 +79,8 @@ void test_all ()
 }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_all ();
+  return 0;
 }
--- a/test/any_of_test.cpp
+++ b/test/any_of_test.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <functional>
 #include <vector>
@@ -100,7 +98,8 @@ void test_any ()
 }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_any ();
+  return 0;
 }
--- a/test/clamp_test.cpp
+++ b/test/clamp_test.cpp
@@ -9,8 +9,7 @@
 #include <boost/config.hpp>
 #include <boost/algorithm/clamp.hpp>

-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 namespace ba = boost::algorithm;

@@ -206,7 +205,7 @@ void test_int_range ()
    BOOST_CHECK ( std::equal ( b_e(junk), outputs ));
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
    test_ints ();
    test_floats ();
@@ -215,4 +214,5 @@ BOOST_AUTO_TEST_CASE( test_main )
    test_int_range ();
 //    test_float_range ();
 //    test_custom_range ();
+    return 0;
 }
--- a/test/copy_if_test1.cpp
+++ b/test/copy_if_test1.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/copy_if.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <algorithm>
 #include <string>
@@ -20,7 +18,6 @@
 #include <list>

 #include <boost/algorithm/cxx11/all_of.hpp>
-#include <boost/algorithm/cxx11/none_of.hpp>

 namespace ba = boost::algorithm;
 // namespace ba = boost;
@@ -31,7 +28,7 @@ bool is_even  ( int v ) { return v % 2 == 0; }
 bool is_odd   ( int v ) { return v % 2 == 1; }

 template <typename Container>
-void test_copy_if ( Container const &c ) {
+void test_sequence ( Container const &c ) {

    typedef typename Container::value_type value_type;
    std::vector<value_type> v;
@@ -49,131 +46,42 @@ void test_copy_if ( Container const &c ) {
    v.clear ();
    ba::copy_if ( c.begin (), c.end (), back_inserter ( v ), is_true);
    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
+    BOOST_CHECK ( std::equal ( c.begin (), c.end (), v.begin ()));

    v.clear ();
    ba::copy_if ( c, back_inserter ( v ), is_true);
    BOOST_CHECK ( v.size () == c.size ());
    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
+    BOOST_CHECK ( std::equal ( c.begin (), c.end (), v.begin ()));

 //  Some of the elements
    v.clear ();
    ba::copy_if ( c.begin (), c.end (), back_inserter ( v ), is_even );
-    BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even ));
+    BOOST_CHECK ( v.size () == std::count_if ( c.begin (), c.end (), is_even ));
    BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));

    v.clear ();
    ba::copy_if ( c, back_inserter ( v ), is_even );
-    BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even ));
+    BOOST_CHECK ( v.size () == std::count_if ( c.begin (), c.end (), is_even ));
    BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));
    }


-template <typename Container>
-void test_copy_while ( Container const &c ) {
-
-    typedef typename Container::value_type value_type;
-    typename Container::const_iterator it;
-    std::vector<value_type> v;
-    
-//  None of the elements
-    v.clear ();
-    ba::copy_while ( c.begin (), c.end (), back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == 0 );
-    
-    v.clear ();
-    ba::copy_while ( c, back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == 0 );
-
-//  All the elements
-    v.clear ();
-    ba::copy_while ( c.begin (), c.end (), back_inserter ( v ), is_true);
-    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-    v.clear ();
-    ba::copy_while ( c, back_inserter ( v ), is_true);
-    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-//  Some of the elements
-    v.clear ();
-    it = ba::copy_while ( c.begin (), c.end (), back_inserter ( v ), is_even ).first;
-    BOOST_CHECK ( v.size () == (size_t) std::distance ( c.begin (), it ));
-    BOOST_CHECK ( it == c.end () || !is_even ( *it ));
-    BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-    v.clear ();
-    it = ba::copy_while ( c, back_inserter ( v ), is_even ).first;
-    BOOST_CHECK ( v.size () == (size_t) std::distance ( c.begin (), it ));
-    BOOST_CHECK ( it == c.end () || !is_even ( *it ));
-    BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-    }
-
-template <typename Container>
-void test_copy_until ( Container const &c ) {
-
-    typedef typename Container::value_type value_type;
-    typename Container::const_iterator it;
-    std::vector<value_type> v;
-    
-//  None of the elements
-    v.clear ();
-    ba::copy_until ( c.begin (), c.end (), back_inserter ( v ), is_true);
-    BOOST_CHECK ( v.size () == 0 );
-
-    v.clear ();
-    ba::copy_until ( c, back_inserter ( v ), is_true);
-    BOOST_CHECK ( v.size () == 0 );
-
-//  All the elements
-    v.clear ();
-    ba::copy_until ( c.begin (), c.end (), back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-    v.clear ();
-    ba::copy_until ( c, back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == c.size ());
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-//  Some of the elements
-    v.clear ();
-    it = ba::copy_until ( c.begin (), c.end (), back_inserter ( v ), is_even ).first;
-    BOOST_CHECK ( v.size () == (size_t) std::distance ( c.begin (), it ));
-    BOOST_CHECK ( it == c.end () || is_even ( *it ));
-    BOOST_CHECK ( ba::none_of ( v.begin (), v.end (), is_even ));
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-
-    v.clear ();
-    it = ba::copy_until ( c, back_inserter ( v ), is_even ).first;
-    BOOST_CHECK ( v.size () == (size_t) std::distance ( c.begin (), it ));
-    BOOST_CHECK ( it == c.end () || is_even ( *it ));
-    BOOST_CHECK ( ba::none_of ( v.begin (), v.end (), is_even ));
-    BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-    }
-    
 void test_sequence1 () {
    std::vector<int> v;
    for ( int i = 5; i < 15; ++i )
        v.push_back ( i );
-    test_copy_if ( v );
-    test_copy_while ( v );
-    test_copy_until ( v );
+    test_sequence  ( v );
    
    std::list<int> l;
    for ( int i = 25; i > 15; --i )
        l.push_back ( i );
-    test_copy_if ( l );
-    test_copy_while ( l );
-    test_copy_until ( l );
+    test_sequence  ( l );   
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/copy_n_test1.cpp
+++ b/test/copy_n_test1.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/copy_n.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -80,7 +78,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/empty_search_test.cpp
+++ b/test/empty_search_test.cpp
@@ -13,10 +13,9 @@
 #include <boost/algorithm/searching/boyer_moore_horspool.hpp>
 #include <boost/algorithm/searching/knuth_morris_pratt.hpp>

-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int argc, char *argv [] )
 {
    const std::string cs;
    std::string estr;
@@ -78,4 +77,7 @@ BOOST_AUTO_TEST_CASE( test_main )
            str.begin (), str.end (), estr.begin (), estr.end ())
        == str.begin ()
        );
+
+   (void) argv; (void) argc;
+   return 0;
 }
--- a/test/equal_test.cpp
+++ b/test/equal_test.cpp
@@ -1,129 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2013.
-
-   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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <boost/config.hpp>
-#include <boost/algorithm/cxx14/equal.hpp>
-
-#include "iterator_test.hpp"
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-template <typename T>
-bool eq ( const T& a, const T& b ) { return a == b; }
-
-template <typename T>
-bool never_eq ( const T&, const T& ) { return false; }
-
-int comparison_count = 0;
-template <typename T>
-bool counting_equals ( const T &a, const T &b ) {
-    ++comparison_count;
-    return a == b;
-    }
-
-namespace ba = boost::algorithm;
-
-void test_equal ()
-{
-//  Note: The literal values here are tested against directly, careful if you change them:
-    int num[] = { 1, 1, 2, 3, 5 };
-    const int sz = sizeof (num)/sizeof(num[0]);
-    
-    
-//  Empty sequences are equal to each other, but not to non-empty sequences
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                              input_iterator<int *>(num),     input_iterator<int *>(num)));
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                              input_iterator<int *>(num),     input_iterator<int *>(num),
-                              never_eq<int> ));
-    BOOST_CHECK ( ba::equal ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num), 
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num),
-                              never_eq<int> ));
-                              
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1)));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num + 1), input_iterator<int *>(num + 2), 
-                              input_iterator<int *>(num),     input_iterator<int *>(num)));
-    BOOST_CHECK (!ba::equal ( random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num + 2), 
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num)));
-
-//  Single element sequences are equal if they contain the same value
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1)));
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              eq<int> ));
-    BOOST_CHECK ( ba::equal ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                              eq<int> ));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              never_eq<int> ));
-    BOOST_CHECK (!ba::equal ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                              never_eq<int> ));
-
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              input_iterator<int *>(num + 1), input_iterator<int *>(num + 2)));
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              input_iterator<int *>(num + 1), input_iterator<int *>(num + 2),
-                              eq<int> ));
-
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num + 2), input_iterator<int *>(num + 3), 
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1)));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num + 2), input_iterator<int *>(num + 3),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                              eq<int> ));
-                              
-//  Identical long sequences are equal. 
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz)));
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              eq<int> ));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              never_eq<int> ));
-    BOOST_CHECK ( ba::equal ( input_iterator<int *>(num),             input_iterator<int *>(num + sz),
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz),
-                              eq<int> ));
-
-//  different sequences are different
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num + 1), input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz)));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num + 1), input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              eq<int> ));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz - 1)));
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz - 1),
-                              eq<int> ));
-
-//  When there's a cheap check, bail early
-    comparison_count = 0;
-    BOOST_CHECK (!ba::equal ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz),
-                              random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz - 1),
-                              counting_equals<int> ));
-    BOOST_CHECK ( comparison_count == 0 );
-//  And when there's not, we can't
-    comparison_count = 0;
-    BOOST_CHECK (!ba::equal ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                              input_iterator<int *>(num),     input_iterator<int *>(num + sz - 1),
-                              counting_equals<int> ));
-    BOOST_CHECK ( comparison_count > 0 );
-    
-}
-
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-  test_equal ();
-}
--- a/test/find_if_not_test1.cpp
+++ b/test/find_if_not_test1.cpp
@@ -11,9 +11,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/find_if_not.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -85,7 +83,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/gather_fail1.cpp
+++ b/test/gather_fail1.cpp
@@ -1,38 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2011-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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <iostream>
-
-#include <boost/config.hpp>
-#include <boost/algorithm/gather.hpp>
-
-#include <string>
-#include <vector>
-#include <list>
-
-#include "iterator_test.hpp"
-
-namespace ba = boost::algorithm;
-
-bool is_ten  ( int i ) { return i == 10; }
-
-void test_sequence1 () {
-    std::vector<int> v;
-    typedef input_iterator<std::vector<int>::iterator> II;    
-
-//  This should fail to compile, since gather doesn't work with input iterators
-    (void) ba::gather ( II( v.begin ()), II( v.end ()), II( v.begin ()), is_ten );
-    }
-
-
-int main ()
-{
-  test_sequence1 ();
-  return 0;
-}
--- a/test/gather_test1.cpp
+++ b/test/gather_test1.cpp
@@ -1,138 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2011-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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <iostream>
-
-#include <boost/config.hpp>
-#include <boost/algorithm/gather.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-#include <vector>
-#include <list>
-
-#include "iterator_test.hpp"
-
-namespace ba = boost::algorithm;
-
-template <typename Container>
-void print ( const char *prompt, const Container &c ) {
-    std::cout << prompt << " { ";
-    std::copy ( c.begin (), c.end (), std::ostream_iterator<typename Container::value_type>(std::cout, " "));
-    std::cout << std::endl;
-    }
-
-template <typename Iterator, typename Predicate>
-void test_iterators ( Iterator first, Iterator last, Predicate comp, std::size_t offset ) {
-//  Create the pivot point
-    Iterator off = first;
-    std::advance(off, offset);
-        
-//  Gather the elements
-    std::pair<Iterator, Iterator> res = ba::gather ( first, last, off, comp );
-
-//  We should now have three sequences, any of which may be empty:
-//      * [begin .. result.first)         - items that do not satisfy the predicate
-//      * [result.first .. result.second) - items that do satisfy the predicate
-//      * [result.second .. end)          - items that do not satisfy the predicate
-    Iterator iter = first;
-    for ( ; iter != res.first; ++iter )
-        BOOST_CHECK ( !comp ( *iter ));
-    for ( ; iter != res.second; ++iter)
-        BOOST_CHECK ( comp ( *iter ));
-    for ( ; iter != last; ++iter )
-        BOOST_CHECK ( !comp ( *iter ));
-    }
-
-template <typename Container, typename Predicate>
-void test_iterator_types ( const Container &c, Predicate comp, std::size_t offset ) {
-    typedef std::vector<typename Container::value_type> vec;
-
-    typedef bidirectional_iterator<typename vec::iterator> BDI;
-    typedef random_access_iterator<typename vec::iterator> RAI;
-    
-    vec v;
-    v.assign ( c.begin (), c.end ());
-    test_iterators ( BDI ( v.begin ()), BDI ( v.end ()), comp, offset );
-    v.assign ( c.begin (), c.end ());
-    test_iterators ( RAI ( v.begin ()), RAI ( v.end ()), comp, offset );
-    }
-
-
-template <typename T>
-struct less_than {
-public:
-//    typedef T argument_type;
-//    typedef bool result_type;
-
-    less_than ( T foo ) : val ( foo ) {}
-    less_than ( const less_than &rhs ) : val ( rhs.val ) {}
-
-    bool operator () ( const T &v ) const { return v < val; }
-private:
-    less_than ();
-    less_than operator = ( const less_than &rhs );
-    T val;
-    };
-
-bool is_even ( int i ) { return i % 2 == 0; }
-bool is_ten  ( int i ) { return i == 10; }
-
-void test_sequence1 () {
-    std::vector<int> v;
-    
-    for ( int i = 5; i < 15; ++i )
-        v.push_back ( i );
-    test_iterator_types ( v, less_than<int>(10),  0 );                  // at beginning
-    test_iterator_types ( v, less_than<int>(10),  5 );
-    test_iterator_types ( v, less_than<int>(10), v.size () - 1 );       // at end
-
-    test_iterator_types ( v, is_even, 0 );
-    test_iterator_types ( v, is_even, 5 );
-    test_iterator_types ( v, is_even, v.size () - 1 );
-
-//  Exactly one element in the sequence matches
-    test_iterator_types ( v, is_ten, 0 );
-    test_iterator_types ( v, is_ten, 5 );
-    test_iterator_types ( v, is_ten, v.size () - 1 );
-
-//  Everything in the sequence matches
-    test_iterator_types ( v, less_than<int>(99),  0 );
-    test_iterator_types ( v, less_than<int>(99),  5 );
-    test_iterator_types ( v, less_than<int>(99), v.size () - 1 );
-    
-//  Nothing in the sequence matches
-    test_iterator_types ( v, less_than<int>(0),  0 );
-    test_iterator_types ( v, less_than<int>(0),  5 );
-    test_iterator_types ( v, less_than<int>(0), v.size () - 1 );
-    
-//  All the elements in the sequence are the same
-    v.clear ();
-    for ( int i = 0; i < 11; ++i )
-        v.push_back ( 10 );
-    
-//  Everything in the sequence matches
-    test_iterator_types ( v, is_ten, 0 );
-    test_iterator_types ( v, is_ten, 5 );
-    test_iterator_types ( v, is_ten, v.size () - 1 );
-
-//  Nothing in the sequence matches
-    test_iterator_types ( v, less_than<int>(5),  0 );
-    test_iterator_types ( v, less_than<int>(5),  5 );
-    test_iterator_types ( v, less_than<int>(5), v.size () - 1 );
-
-    }
-
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-  test_sequence1 ();
-}
--- a/test/hex_fail1.cpp
+++ b/test/hex_fail1.cpp
@@ -9,17 +9,17 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
 #include <vector>

 //  should not compile: vector is not an integral type
-int main( int , char* [] )
+int test_main( int , char* [] )
 {
  std::vector<float> v;
  std::string out;
  boost::algorithm::unhex ( out, std::back_inserter(v));
-
  return 0;
 }
--- a/test/hex_test1.cpp
+++ b/test/hex_test1.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -143,7 +141,7 @@ const wchar_t *fromhex_fail_w [] = {
    };


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_to_hex<std::string> ( tohex );
  test_from_hex_success<std::string> ( fromhex );
@@ -152,4 +150,5 @@ BOOST_AUTO_TEST_CASE( test_main )
  test_to_hex<std::wstring> ( tohex_w );
  test_from_hex_success<std::wstring> ( fromhex_w );
  test_from_hex_failure<std::wstring> ( fromhex_fail_w );
+  return 0;
 }
--- a/test/hex_test2.cpp
+++ b/test/hex_test2.cpp
@@ -11,9 +11,7 @@ Test non-string cases; vector and list

 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -131,8 +129,9 @@ void test_from_hex_success () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_to_hex ();
  test_from_hex_success ();
+  return 0;
 }
--- a/test/hex_test3.cpp
+++ b/test/hex_test3.cpp
@@ -11,9 +11,7 @@ Try ostream_iterators

 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -115,10 +113,11 @@ const wchar_t *fromhex_w [] = {



-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_to_hex ( tohex );
  test_to_hex ( tohex_w );
  test_from_hex_success ( fromhex );
  test_from_hex_success ( fromhex_w );
+  return 0;
 }
--- a/test/hex_test4.cpp
+++ b/test/hex_test4.cpp
@@ -11,9 +11,7 @@ Try ostream_iterators

 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <iostream>
@@ -138,8 +136,10 @@ void test_nonhex_input () {
    test_nonhex_input4 ();
    }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
    test_short_input ();
    test_nonhex_input ();
+    
+  return 0;
 }
--- a/test/iota_test1.cpp
+++ b/test/iota_test1.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/iota.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <iostream>
 #include <string>
@@ -42,11 +40,11 @@ void test_ints () {
    std::vector<int> v;
    std::list<int> l;

-    v.clear (); v.resize ( 10 );
+    v.clear (); v.reserve ( 10 );
    boost::algorithm::iota ( v.begin (), v.end (), 23 );
    BOOST_CHECK ( test_iota_results ( v.begin (), v.end (), 23 ));
    
-    v.clear (); v.resize ( 19 );
+    v.clear (); v.reserve ( 19 );
    boost::algorithm::iota ( v, 18 );
    BOOST_CHECK ( test_iota_results ( v, 18 ));
    
@@ -54,10 +52,6 @@ void test_ints () {
    boost::algorithm::iota_n ( std::back_inserter(v), 99, 20 );
    BOOST_CHECK ( test_iota_results ( v, 99 ));
    
-    v.clear ();
-    boost::algorithm::iota_n ( std::back_inserter(v), 99, 0 );
-    BOOST_CHECK ( v.size() == 0 );
-
 /*
    l.clear (); l.reserve ( 5 );
    boost::algorithm::iota ( l.begin (), l.end (), 123 );
@@ -78,7 +72,8 @@ void test_ints () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_ints ();
+  return 0;
 }
--- a/test/is_partitioned_test1.cpp
+++ b/test/is_partitioned_test1.cpp
@@ -11,9 +11,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/is_partitioned.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -58,7 +56,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/is_permutation_test1.cpp
+++ b/test/is_permutation_test1.cpp
@@ -11,104 +11,16 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/is_permutation.hpp>
-#include <boost/algorithm/cxx14/is_permutation.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
 #include <list>

-#include "iterator_test.hpp"
-
-template <typename T>
-bool eq ( const T& a, const T& b ) { return a == b; }
-
-template <typename T>
-bool never_eq ( const T&, const T& ) { return false; }
-
 namespace ba = boost::algorithm;
+// namespace ba = boost;

 void test_sequence1 () {
-    int num[] = { 1, 1, 2, 3, 5 };
-    const int sz = sizeof (num)/sizeof(num[0]);
-
-//  Empty sequences
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num), 
-            forward_iterator<int *>(num)));
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num), 
-            forward_iterator<int *>(num),     forward_iterator<int *>(num)));
-    BOOST_CHECK (
-        ba::is_permutation (
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num), 
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num)));
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num), 
-            forward_iterator<int *>(num), 
-            never_eq<int> ));       // Since the sequences are empty, the pred is never called
-            
-//  Empty vs. non-empty
-    BOOST_CHECK ( !
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num), 
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + 1)));
-
-    BOOST_CHECK ( !
-        ba::is_permutation ( 
-            forward_iterator<int *>(num + 1), forward_iterator<int *>(num + 2), 
-            forward_iterator<int *>(num),     forward_iterator<int *>(num)));
-                    
-    BOOST_CHECK ( !
-        ba::is_permutation (
-            random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num + 2), 
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num)));
-
-    BOOST_CHECK ( !
-        ba::is_permutation (
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num), 
-            random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num + 2)));
-
-//  Something should be a permutation of itself
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz), 
-            forward_iterator<int *>(num)));
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz), 
-            forward_iterator<int *>(num), eq<int> ));
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz), 
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz )));
-    BOOST_CHECK (
-        ba::is_permutation (
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz), 
-            forward_iterator<int *>(num),     forward_iterator<int *>(num + sz ),
-            eq<int> ));
-            
-    BOOST_CHECK (
-        ba::is_permutation (
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz), 
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz)));
-    BOOST_CHECK (
-        ba::is_permutation (
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz), 
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz),
-            eq<int> ));
-    BOOST_CHECK (
-        ba::is_permutation (
-            random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz), 
-            forward_iterator<int *>(num),           forward_iterator<int *>(num + sz),
-            eq<int> ));
-    
-
    std::vector<int> v, v1;
    
    v.clear ();
@@ -130,7 +42,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/iterator_test.hpp
+++ b/test/iterator_test.hpp
@@ -1,305 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2013.
-
-   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)
-
-    For more information, see http://www.boost.org
-*/
-
-#ifndef ITERATOR_TEST_H
-#define ITERATOR_TEST_H
-
-/* 
-    A set of iterator adapters for constructing test cases
-    From an iterator (or a pointer), you can make any class of iterator.
-    Assuming you want to degrade the capabilities.
-    
-    Modeled closely on work that Howard Hinnant did for libc++.
-*/
-
-#include <iterator>
-
-// == Input Iterator ==
-template <typename It>
-class input_iterator {
-public:
-    typedef          std::input_iterator_tag                   iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    input_iterator() : it_() {}
-    explicit input_iterator(It it) : it_(it) {}
-
-    template <typename U>
-    input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer  operator->() const {return  it_;}
-
-    input_iterator& operator++()    {++it_; return *this;}
-    input_iterator  operator++(int) {input_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const input_iterator& x, const input_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const input_iterator& x, const input_iterator& y)
-        {return !(x == y);}
-
-private:
-    It it_;
-    template <typename U> friend class input_iterator;
-};
-
-template <typename T, typename U>
-inline bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <typename T, typename U>
-inline bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-
-// == Forward Iterator ==
-template <typename It>
-class forward_iterator {
-public:
-    typedef          std::forward_iterator_tag                 iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    forward_iterator() : it_() {}
-    explicit forward_iterator(It it) : it_(it) {}
-    template <typename U>
-    forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer  operator->() const {return  it_;}
-
-    forward_iterator& operator++()    {++it_; return *this;}
-    forward_iterator  operator++(int) {forward_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const forward_iterator& x, const forward_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
-        {return !(x == y);}
-private:
-    It it_;
-
-    template <typename U> friend class forward_iterator;
-};
-
-template <typename T, typename U>
-inline bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <typename T, typename U>
-inline bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-// == Bidirectional Iterator ==
-template <typename It>
-class bidirectional_iterator
-{
-public:
-    typedef          std::bidirectional_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    bidirectional_iterator() : it_() {}
-    explicit bidirectional_iterator(It it) : it_(it) {}
-    template <typename U>
-    bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer  operator->() const {return  it_;}
-
-    bidirectional_iterator& operator++()    {++it_; return *this;}
-    bidirectional_iterator  operator++(int) {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
-    bidirectional_iterator& operator--()    {--it_; return *this;}
-    bidirectional_iterator  operator--(int) {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-private:
-    It it_;
-    template <typename U> friend class bidirectional_iterator;
-};
-
-template <typename T, typename U>
-inline bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <typename T, typename U>
-inline bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-
-// == Random Access Iterator ==
-template <typename It>
-class random_access_iterator {
-public:
-    typedef          std::random_access_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    random_access_iterator() : it_() {}
-    explicit random_access_iterator(It it) : it_(it) {}
-    template <typename U>
-    random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer  operator->() const {return  it_;}
-
-    random_access_iterator& operator++()    {++it_; return *this;}
-    random_access_iterator  operator++(int) {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
-    random_access_iterator& operator--()    {--it_; return *this;}
-    random_access_iterator  operator--(int) {random_access_iterator tmp(*this); --(*this); return tmp;}
-
-    random_access_iterator& operator+=(difference_type n)       {it_ += n; return *this;}
-    random_access_iterator  operator+ (difference_type n) const {random_access_iterator tmp(*this); tmp += n; return tmp;}
-    friend random_access_iterator operator+(difference_type n, random_access_iterator x) {x += n; return x;}
-
-    random_access_iterator& operator-=(difference_type n)       {return *this += -n;}
-    random_access_iterator  operator- (difference_type n) const {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
-    reference operator[](difference_type n) const {return it_[n];}
-private:
-    It it_;
-
-    template <typename U> friend class random_access_iterator;
-};
-
-template <typename T, typename U>
-inline bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <typename T, typename U>
-inline bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <typename T, typename U>
-inline bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() < y.base();
-}
-
-template <typename T, typename U>
-inline bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(y < x);
-}
-
-template <typename T, typename U>
-inline bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return y < x;
-}
-
-template <typename T, typename U>
-inline bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x < y);
-}
-
-template <typename T, typename U>
-inline typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() - y.base();
-}
-
-
-// == Output Iterator ==
-template <typename It>
-class output_iterator {
-public:
-    typedef          std::output_iterator_tag                  iterator_category;
-    typedef void                                               value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    output_iterator () {}
-    explicit output_iterator(It it) : it_(it) {}
-
-    template <typename U>
-    output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-
-    output_iterator& operator++()    {++it_; return *this;}
-    output_iterator  operator++(int) {output_iterator tmp(*this); ++(*this); return tmp;}
-
-private:
-    It it_;
-    template <typename U> friend class output_iterator;
-    };
-    
-//  No comparison operators for output iterators
-    
-
-// == Get the base of an iterator; used for comparisons ==
-template <typename Iter>
-inline Iter base(output_iterator<Iter> i) { return i.base(); }
-
-template <typename Iter>
-inline Iter base(input_iterator<Iter> i) { return i.base(); }
-
-template <typename Iter>
-inline Iter base(forward_iterator<Iter> i) { return i.base(); }
-
-template <typename Iter>
-inline Iter base(bidirectional_iterator<Iter> i) { return i.base(); }
-
-template <typename Iter>
-inline Iter base(random_access_iterator<Iter> i) { return i.base(); }
-
-template <typename Iter>    // everything else
-inline Iter base(Iter i) { return i; }
-
-#endif  // ITERATORS_H
--- a/test/mismatch_test.cpp
+++ b/test/mismatch_test.cpp
@@ -1,168 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2013.
-
-   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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <boost/config.hpp>
-#include <boost/algorithm/cxx14/mismatch.hpp>
-
-#include "iterator_test.hpp"
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-template <typename T>
-bool eq ( const T& a, const T& b ) { return a == b; }
-
-template <typename T>
-bool never_eq ( const T&, const T& ) { return false; }
-
-namespace ba = boost::algorithm;
-
-template <typename Iter1, typename Iter2>
-bool iter_eq ( std::pair<Iter1, Iter2> pr, Iter1 first, Iter2 second ) {
-    return pr.first == first && pr.second == second;
-    }
-
-void test_mismatch ()
-{
-//  Note: The literal values here are tested against directly, careful if you change them:
-    int num[] = { 1, 1, 2, 3, 5 };
-    const int sz = sizeof (num)/sizeof(num[0]);
-    
-    
-//  No mismatch for empty sequences
-    BOOST_CHECK ( iter_eq ( 
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                       input_iterator<int *>(num),     input_iterator<int *>(num)),
-                input_iterator<int *>(num), input_iterator<int *>(num)));
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                       input_iterator<int *>(num),     input_iterator<int *>(num),
-                       never_eq<int> ),
-                input_iterator<int *>(num), input_iterator<int *>(num)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num), 
-                       random_access_iterator<int *>(num),     random_access_iterator<int *>(num),
-                       never_eq<int> ),
-                random_access_iterator<int *>(num), random_access_iterator<int *>(num)));
-                              
-//  Empty vs. non-empty mismatch immediately
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num), 
-                       input_iterator<int *>(num),     input_iterator<int *>(num + 1)),
-                input_iterator<int *>(num),     input_iterator<int *>(num)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num + 1), input_iterator<int *>(num + 2), 
-                       input_iterator<int *>(num),     input_iterator<int *>(num)),
-                input_iterator<int *>(num + 1), input_iterator<int *>(num)));
-                    
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num + 2), 
-                       random_access_iterator<int *>(num),     random_access_iterator<int *>(num)),
-                random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num)));
-
-//  Single element sequences are equal if they contain the same value
-    BOOST_CHECK ( iter_eq ( 
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + 1)),
-                input_iterator<int *>(num + 1), input_iterator<int *>(num + 1)));
-                       
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       eq<int> ),
-                input_iterator<int *>(num + 1), input_iterator<int *>(num + 1)));
-                    
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                       random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                       eq<int> ),
-                random_access_iterator<int *>(num + 1), random_access_iterator<int *>(num + 1)));
-
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       never_eq<int> ),
-               input_iterator<int *>(num),     input_iterator<int *>(num)));
-               
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                       random_access_iterator<int *>(num),     random_access_iterator<int *>(num + 1),
-                       never_eq<int> ),
-               random_access_iterator<int *>(num),     random_access_iterator<int *>(num)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       input_iterator<int *>(num + 1), input_iterator<int *>(num + 2)),
-               input_iterator<int *>(num + 1), input_iterator<int *>(num + 2)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       input_iterator<int *>(num + 1), input_iterator<int *>(num + 2),
-                       eq<int> ),
-               input_iterator<int *>(num + 1), input_iterator<int *>(num + 2)));
-
-    BOOST_CHECK ( iter_eq (
-            ba::mismatch ( input_iterator<int *>(num + 2), input_iterator<int *>(num + 3), 
-                           input_iterator<int *>(num),     input_iterator<int *>(num + 1)),
-                           input_iterator<int *>(num + 2), input_iterator<int *>(num)));
-                           
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num + 2), input_iterator<int *>(num + 3),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + 1),
-                       eq<int> ),
-               input_iterator<int *>(num + 2), input_iterator<int *>(num)));
-                       
-                              
-                              
-//  Identical long sequences are equal. 
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + sz)),
-            input_iterator<int *>(num + sz), input_iterator<int *>(num + sz)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       eq<int> ),
-            input_iterator<int *>(num + sz), input_iterator<int *>(num + sz)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       never_eq<int> ),
-            input_iterator<int *>(num),     input_iterator<int *>(num)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num),             input_iterator<int *>(num + sz),
-                       random_access_iterator<int *>(num),     random_access_iterator<int *>(num + sz),
-                       never_eq<int> ),
-            input_iterator<int *>(num),     random_access_iterator<int *>(num)));
-
-//  different sequences are different
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num + 1), input_iterator<int *>(num + sz),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + sz)),
-            input_iterator<int *>(num + 2), input_iterator<int *>(num + 1)));
-
-    BOOST_CHECK ( iter_eq (
-        ba::mismatch ( input_iterator<int *>(num + 1), input_iterator<int *>(num + sz),
-                       input_iterator<int *>(num),     input_iterator<int *>(num + sz),
-                       eq<int> ),
-            input_iterator<int *>(num + 2), input_iterator<int *>(num + 1)));
-
-}
-
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-  test_mismatch ();
-}
--- a/test/none_of_test.cpp
+++ b/test/none_of_test.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/none_of.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <functional>
 #include <vector>
@@ -91,7 +89,8 @@ void test_none()
    BOOST_CHECK (!ba::none_of       ( li.begin(), l_iter, is_<int> (  5 )));
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_none();
+  return 0;
 }
--- a/test/one_of_test.cpp
+++ b/test/one_of_test.cpp
@@ -9,9 +9,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/one_of.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <functional>
 #include <vector>
@@ -96,7 +94,8 @@ void test_one ()
 }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_one ();
+  return 0;
 }
--- a/test/ordered_test.cpp
+++ b/test/ordered_test.cpp
@@ -13,9 +13,7 @@
 #include <iostream>

 #include <boost/algorithm/cxx11/is_sorted.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 using namespace boost;

@@ -148,8 +146,9 @@ test_increasing_decreasing(void)
    
 }

-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int, char * [] )
 {
    test_ordered ();
    test_increasing_decreasing ();
+    return 0;
 }
--- a/test/partition_copy_test1.cpp
+++ b/test/partition_copy_test1.cpp
@@ -11,9 +11,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/partition_copy.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/cxx11/none_of.hpp>
@@ -82,7 +80,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/partition_point_test1.cpp
+++ b/test/partition_point_test1.cpp
@@ -11,9 +11,7 @@

 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/partition_point.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <string>
 #include <vector>
@@ -43,17 +41,16 @@ void test_sequence ( Container &v, Predicate comp, int expected ) {
    
    res = ba::partition_point ( v.begin (), v.end (), comp );
    exp = offset_to_iter ( v, expected );
+    std::cout << "Expected(1): " << std::distance ( v.begin (), exp ) 
+              <<       ", got: " << std::distance ( v.begin (), res ) << std::endl;
    BOOST_CHECK ( exp == res );

 //  Duplicate the last element; this checks for any even/odd problems
    v.push_back ( * v.rbegin ());
    res = ba::partition_point ( v.begin (), v.end (), comp );
    exp = offset_to_iter ( v, expected );
-    BOOST_CHECK ( exp == res );
-
-//  Range based test
-    res = ba::partition_point ( v, comp );
-    exp = offset_to_iter ( v, expected );
+    std::cout << "Expected(2): " << std::distance ( v.begin (), exp ) 
+              <<       ", got: " << std::distance ( v.begin (), res ) << std::endl;
    BOOST_CHECK ( exp == res );
    }

@@ -94,7 +91,8 @@ void test_sequence1 () {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
  test_sequence1 ();
+  return 0;
 }
--- a/test/power_fail1.cpp
+++ b/test/power_fail1.cpp
@@ -1,24 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2014.
-
-   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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <iostream>
-
-#include <boost/config.hpp>
-#include <boost/algorithm/algorithm.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-namespace ba = boost::algorithm;
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-//  Second argument must be an integral value
-    BOOST_CHECK ( ba::power(1, 1.0) == 1);
-}
--- a/test/power_test.cpp
+++ b/test/power_test.cpp
@@ -1,35 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2014.
-
-   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)
-
-    For more information, see http://www.boost.org
-*/
-
-#include <iostream>
-
-#include <boost/config.hpp>
-#include <boost/algorithm/algorithm.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-namespace ba = boost::algorithm;
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-    BOOST_CHECK ( ba::power(0, 0) == 1);
-    BOOST_CHECK ( ba::power(5, 0) == 1);
-    BOOST_CHECK ( ba::power(1, 1) == 1);
-    BOOST_CHECK ( ba::power(1, 4) == 1);
-    BOOST_CHECK ( ba::power(3, 2) == 9);
-    BOOST_CHECK ( ba::power(2, 3) == 8);
-    BOOST_CHECK ( ba::power(3, 3) == 27);
-    BOOST_CHECK ( ba::power(2, 30) == 0x40000000);
-    BOOST_CHECK ( ba::power(5L, 10) == 3125*3125);
-    BOOST_CHECK ( ba::power(18, 3) == 18*18*18);
-    
-    BOOST_CHECK ( ba::power(3,2) == ba::power(3,2, std::multiplies<int>()));
-    BOOST_CHECK ( ba::power(3,2, std::plus<int>()) == 6);
-}
--- a/test/search_fail1.cpp
+++ b/test/search_fail1.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 #include <boost/algorithm/searching/boyer_moore.hpp>

-int main( int , char* [] )
+int main( int argc, char *argv [] )
 {
    std::vector<char>   cv;
    std::vector<int>    iv;
@@ -20,5 +20,7 @@ int main( int , char* [] )
    (void) boost::algorithm::boyer_moore_search (
        cv.begin (), cv.end (), iv.begin (), iv.end ());

+   
+   (void) argv; (void) argc;
   return 0;
 }
--- a/test/search_fail2.cpp
+++ b/test/search_fail2.cpp
@@ -11,7 +11,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/algorithm/searching/boyer_moore.hpp>

-int main( int , char* [] )
+int main( int argc, char *argv [] )
 {
    std::vector<boost::uint8_t> cv;
    std::vector<boost:: int8_t> iv;
@@ -21,5 +21,7 @@ int main( int , char* [] )
    (void) boost::algorithm::boyer_moore_search (
        cv.begin (), cv.end (), iv.begin (), iv.end ());

+   
+   (void) argv; (void) argc;
   return 0;
 }
--- a/test/search_fail3.cpp
+++ b/test/search_fail3.cpp
@@ -10,10 +10,11 @@
 #include <vector>
 #include <boost/algorithm/searching/boyer_moore.hpp>

-int main( int , char* [] )
+int main( int argc, char *argv [] )
 {
 //  Should fail to compile because the search objects are not default-constructible
    boost::algorithm::boyer_moore<std::vector<char>::iterator> bm;
   
+   (void) argv; (void) argc;
   return 0;
 }
--- a/test/search_test1.cpp
+++ b/test/search_test1.cpp
@@ -11,8 +11,7 @@
 #include <boost/algorithm/searching/boyer_moore_horspool.hpp>
 #include <boost/algorithm/searching/knuth_morris_pratt.hpp>

-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>

 #include <iostream>
 #include <string>
@@ -219,7 +218,7 @@ namespace {
    }


-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
    std::string haystack1 ( "NOW AN FOWE\220ER ANNMAN THE ANPANMANEND" );
    std::string needle1   ( "ANPANMAN" );
@@ -269,4 +268,5 @@ BOOST_AUTO_TEST_CASE( test_main )
    const std::string mikhail_corpus = std::string (8, 'a') + mikhail_pattern;

    check_one ( mikhail_corpus, mikhail_pattern, 8 );
+    return 0;
    }
--- a/Show More
+++ b/Show More