Release 1.52.0

[SVN r81201]

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.

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]
 

doc/boyer_moore.qbk

@@ -14,7 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [heading Overview]
 
-The header file 'boyer_moore.hpp' contains an implementation of the Boyer-Moore algorithm for searching sequences of values. 
+The header file 'boyer_moore.hpp' contains an an implementation of the Boyer-Moore algorithm for searching sequences of values. 
 
 The Boyer–Moore string search algorithm is a particularly efficient string searching algorithm, and it has been the standard benchmark for the practical string search literature. The Boyer-Moore algorithm was invented by Bob Boyer and J. Strother Moore, and published in the October 1977 issue of the Communications of the ACM , and a copy of that article is available at [@http://www.cs.utexas.edu/~moore/publications/fstrpos.pdf].
 
@@ -26,7 +26,7 @@ Nomenclature: I refer to the sequence being searched for as the "pattern", and t
 
 [heading Interface]
 
-For flexibility, the Boyer-Moore algorithm has two interfaces; an object-based interface and a procedural one. The object-based interface builds the tables in the constructor, and uses operator () to perform the search. The procedural interface builds the table and does the search all in one step. If you are going to be searching for the same pattern in multiple corpora, then you should use the object interface, and only build the tables once.
+For flexibility, the Boyer-Moore algorithm has has two interfaces; an object-based interface and a procedural one. The object-based interface builds the tables in the constructor, and uses operator () to perform the search. The procedural interface builds the table and does the search all in one step. If you are going to be searching for the same pattern in multiple corpora, then you should use the object interface, and only build the tables once.
 
 Here is the object interface:
 ``

doc/boyer_moore_horspool.qbk

@@ -14,7 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [heading Overview]
 
-The header file 'boyer_moore_horspool.hpp' contains an implementation of the Boyer-Moore-Horspool algorithm for searching sequences of values. 
+The header file 'boyer_moore_horspool.hpp' contains an an implementation of the Boyer-Moore-Horspool algorithm for searching sequences of values. 
 
 The Boyer-Moore-Horspool search algorithm was published by Nigel Horspool in 1980. It is a refinement of the Boyer-Moore algorithm that trades space for time. It uses less space for internal tables than Boyer-Moore, and has poorer worst-case performance.
 
@@ -24,7 +24,7 @@ The Boyer-Moore-Horspool algorithm cannot be used with comparison predicates lik
 
 Nomenclature: I refer to the sequence being searched for as the "pattern", and the sequence being searched in as the "corpus".
 
-For flexibility, the Boyer-Moore-Horspool algorithm has two interfaces; an object-based interface and a procedural one. The object-based interface builds the tables in the constructor, and uses operator () to perform the search. The procedural interface builds the table and does the search all in one step. If you are going to be searching for the same pattern in multiple corpora, then you should use the object interface, and only build the tables once.
+For flexibility, the Boyer-Moore-Horspool algorithm has has two interfaces; an object-based interface and a procedural one. The object-based interface builds the tables in the constructor, and uses operator () to perform the search. The procedural interface builds the table and does the search all in one step. If you are going to be searching for the same pattern in multiple corpora, then you should use the object interface, and only build the tables once.
 
 Here is the object interface:
 ``

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 (), seq1.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).
-]
-

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).
-]
-

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>

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).
-]
-

doc/knuth_morris_pratt.qbk

@@ -14,69 +14,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [heading Overview]
 
-The header file 'knuth_morris_pratt.hpp' contains an implementation of the Knuth-Morris-Pratt algorithm for searching sequences of values. 
+The header file 'knuth_morris_pratt.hpp' contains an an implementation of the Knuth-Morris-Pratt algorithm for searching sequences of values. 
 
-The basic premise of the Knuth-Morris-Pratt algorithm is that when a mismatch occurs, there is information in the pattern being searched for that can be used to determine where the next match could begin, enabling the skipping of some elements of the corpus that have already been examined.
-
-It does this by building a table from the pattern being searched for, with one entry for each element in the pattern.
-
-The algorithm was conceived in 1974 by Donald Knuth and Vaughan Pratt, and independently by James H. Morris. The three published it jointly in 1977 in the SIAM Journal on Computing [@http://citeseer.ist.psu.edu/context/23820/0]
-
-However, the Knuth-Morris-Pratt algorithm cannot be used with comparison predicates like `std::search`.
-
-[heading Interface]
-
-Nomenclature: I refer to the sequence being searched for as the "pattern", and the sequence being searched in as the "corpus".
-
-For flexibility, the Knuth-Morris-Pratt algorithm has two interfaces; an object-based interface and a procedural one. The object-based interface builds the table in the constructor, and uses operator () to perform the search. The procedural interface builds the table and does the search all in one step. If you are going to be searching for the same pattern in multiple corpora, then you should use the object interface, and only build the tables once.
-
-Here is the object interface:
-``
-template <typename patIter>
-class knuth_morris_pratt {
-public:
-    knuth_morris_pratt ( patIter first, patIter last );
-    ~knuth_morris_pratt ();
-    
-    template <typename corpusIter>
-    corpusIter operator () ( corpusIter corpus_first, corpusIter corpus_last );
-    };
-``
-
-and here is the corresponding procedural interface:
-
-``
-template <typename patIter, typename corpusIter>
-corpusIter knuth_morris_pratt_search ( 
-        corpusIter corpus_first, corpusIter corpus_last, 
-        patIter pat_first, patIter pat_last );
-``
-
-Each of the functions is passed two pairs of iterators. The first two define the corpus and the second two define the pattern. Note that the two pairs need not be of the same type, but they do need to "point" at the same type. In other words, `patIter::value_type` and `curpusIter::value_type` need to be the same type.
-
-The return value of the function is an iterator pointing to the start of the pattern in the corpus. If the pattern is not found, it returns the end of the corpus (`corpus_last`).
-
-[heading Performance]
-
-The execution time of the Knuth-Morris-Pratt algorithm is linear in the size of the string being searched. Generally the algorithm gets faster as the pattern being searched for becomes longer. Its efficiency derives from the fact that with each unsuccessful attempt to find a match between the search string and the text it is searching, it uses the information gained from that attempt to rule out as many positions of the text as possible where the string cannot match.
-
-[heading Memory Use]
-
-The algorithm an that contains one entry for each element the pattern, plus one extra.  So, when searching for a 1026 byte string, the table will have 1027 entries.
-
-[heading Complexity]
-
-The worst-case performance is ['O(2n)], where ['n] is the length of the corpus. The average time is ['O(n)]. The best case performance is sub-linear.
-
-[heading Exception Safety]
-
-Both the object-oriented and procedural versions of the Knuth-Morris-Pratt algorithm take their parameters by value and do not use any information other than what is passed in. Therefore, both interfaces provide the strong exception guarantee.
-
-[heading Notes]
-
-* When using the object-based interface, the pattern must remain unchanged for during the searches; i.e, from the time the object is constructed until the final call to operator () returns.
-
-* The Knuth-Morris-Pratt algorithm requires random-access iterators for both the pattern and the corpus. It should be possible to write this to use bidirectional iterators (or possibly even forward ones), but this implementation does not do that.
 
 [endsect]
 

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 (), seq1.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 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).
-]
-

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]
 

doc/ordered-hpp.qbk

@@ -73,7 +73,7 @@ Given the sequence `{ 1, 2, 3, 4, 5, 9 }`,   `is_sorted_until ( beg, end, std::l
 
 There are also a set of "wrapper functions" for is_ordered which make it easy to see if an entire sequence is ordered. These functions return a boolean indicating success or failure rather than an iterator to where the out of order items were found.
 
-To test if a sequence is increasing (each element at least as large as the preceding one):
+To test if a sequence is increasing (each element at least as large as the preceeding one):
 ``
 namespace boost { namespace algorithm {
 	template <typename Iterator>
@@ -84,7 +84,7 @@ namespace boost { namespace algorithm {
 }}
 ``
 
-To test if a sequence is decreasing (each element no larger than the preceding one):
+To test if a sequence is decreasing (each element no larger than the preceeding one):
 
 ``
 namespace boost { namespace algorithm {
@@ -96,7 +96,7 @@ namespace boost { namespace algorithm {
 }}
 ``
 
-To test if a sequence is strictly increasing (each element larger than the preceding one):
+To test if a sequence is strictly increasing (each element larger than the preceeding one):
 ``
 namespace boost { namespace algorithm {
 	template <typename Iterator>
@@ -107,7 +107,7 @@ namespace boost { namespace algorithm {
 }}
 ``
 
-To test if a sequence is strictly decreasing (each element smaller than the preceding one):
+To test if a sequence is strictly decreasing (each element smaller than the preceeding one):
 ``
 namespace boost { namespace algorithm {
 	template <typename Iterator>

include/boost/algorithm/cxx11/copy_if.hpp

@@ -63,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
@@ -71,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);
 }
@@ -107,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 )
@@ -125,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);
 }

include/boost/algorithm/cxx11/iota.hpp

@@ -63,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;
 }

include/boost/algorithm/cxx11/is_partitioned.hpp

@@ -24,11 +24,11 @@ namespace boost { namespace algorithm {
 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
+/// \brief Tests to see if a sequence is partititioned according to a predicate
 /// 
 /// \param first    The start of the input sequence
 /// \param last     One past the end of the input sequence
-/// \param p        The predicate to test the values with
+/// \param p        The predicicate to test the values with
 /// \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.
@@ -51,7 +51,7 @@ bool is_partitioned ( InputIterator first, InputIterator last, UnaryPredicate p
 /// \brief Generates an increasing sequence of values, and stores them in the input Range.
 /// 
 /// \param r        The input range
-/// \param p        The predicate to test the values with
+/// \param p        The predicicate to test the values with
 ///
 template <typename Range, typename UnaryPredicate>
 bool is_partitioned ( const Range &r, UnaryPredicate p )

include/boost/algorithm/cxx11/is_permutation.hpp

@@ -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,82 +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
 
-#if __cplusplus >= 201103L
-//  Use the C++11 versions of is_permutation if it is available
-using std::is_permutation;              // Section 25.2.12
-#else
 
 /// \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
 ///
@@ -120,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;
@@ -127,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;
@@ -136,84 +90,23 @@ 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 ( 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++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, 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?
-    return boost::algorithm::detail::is_permutation_tag (
-        first1, last1, first2, 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++2011 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 )
-{
-    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 ());
-}
-
-
-
 /// \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
 ///

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

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

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
-

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;

include/boost/algorithm/minmax_element.hpp

@@ -99,10 +99,8 @@ namespace boost {
 
       // if odd number of elements, treat last element
       if (first != last) { // odd number of elements
-        if (comp(first, min_result)) {
-          min_result = first;
-          potential_min_result = last;
-          }
+        if (comp(first, min_result))
+          min_result = first, potential_min_result = last;
         else if (comp(max_result, first))
           max_result = first;
       }

include/boost/algorithm/searching/boyer_moore.hpp

@@ -33,8 +33,8 @@ References:
     http://www.cs.utexas.edu/users/moore/best-ideas/string-searching/
     http://www.cs.utexas.edu/~moore/publications/fstrpos.pdf
     
-Explanations:
-    http://en.wikipedia.org/wiki/Boyer%E2%80%93Moore_string_search_algorithm
+Explanations:   boostinspect:noascii (test tool complains)
+    http://en.wikipedia.org/wiki/Boyer–Moore_string_search_algorithm
     http://www.movsd.com/bm.htm
     http://www.cs.ucdavis.edu/~gusfield/cs224f09/bnotes.pdf
 

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/tr1/tr1/unordered_map>
-#else
-#include <unordered_map>
-#endif
 
 #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 std::tr1::unordered_map<key_type, value_type> skip_map;
-#else
-        typedef std::unordered_map<key_type, value_type> skip_map;
-#endif
         const value_type k_default_value;
         skip_map skip_;
         

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>
 

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>
@@ -56,7 +56,7 @@ namespace boost {
                 // Copy the beginning of the sequence
                 Output = std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
                 // Format find result
-                // Copy formatted result
+                // Copy formated result
                 Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
                 // Copy the rest of the sequence
                 Output = std::copy( M.end(), ::boost::end(Input), Output );
@@ -118,11 +118,11 @@ namespace boost {
 
                 InputT Output;
                 // Copy the beginning of the sequence
-                boost::algorithm::detail::insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() );
-                // Copy formatted result
-                boost::algorithm::detail::insert( Output, ::boost::end(Output), M.format_result() );
+                insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() );
+                // Copy formated result
+                insert( Output, ::boost::end(Output), M.format_result() );
                 // Copy the rest of the sequence
-                boost::algorithm::detail::insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) );
+                insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) );
 
                 return Output;
             }

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>
@@ -58,7 +58,7 @@ namespace boost {
                 {
                     // Copy the beginning of the sequence
                     Output = std::copy( LastMatch, M.begin(), Output );
-                    // Copy formatted result
+                    // Copy formated result
                     Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
 
                     // Proceed to the next match
@@ -134,9 +134,9 @@ namespace boost {
                 while( M )
                 {
                     // Copy the beginning of the sequence
-                    boost::algorithm::detail::insert( Output, ::boost::end(Output), LastMatch, M.begin() );
-                    // Copy formatted result
-                    boost::algorithm::detail::insert( Output, ::boost::end(Output), M.format_result() );
+                    insert( Output, ::boost::end(Output), LastMatch, M.begin() );
+                    // Copy formated result
+                    insert( Output, ::boost::end(Output), M.format_result() );
 
                     // Proceed to the next match
                     LastMatch=M.end();
@@ -218,7 +218,7 @@ namespace boost {
                     // Adjust search iterator
                     SearchIt=M.end();
 
-                    // Copy formatted replace to the storage
+                    // Copy formated replace to the storage
                     ::boost::algorithm::detail::copy_to_storage( Storage, M.format_result() );
 
                     // Find range for a next match

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 {

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>

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>
@@ -92,7 +92,7 @@ namespace boost {
 
 //  find last functor -----------------------------------------------//
 
-            // find the last match a subsequence in the sequence ( functor )
+            // find the last match a subseqeunce in the sequence ( functor )
             /*
                 Returns a pair <begin,end> marking the subsequence in the sequence.
                 If the find fails, returns <End,End>
@@ -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 ) )

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>
 
@@ -60,14 +60,14 @@ namespace boost {
                     return *this;
                 }
 
-                // Match result retrieval
+                // Match result retrival
                 const match_results_type& match_results() const
                 {
                     return m_MatchResults;
                 }
 
             private:
-                // Saved match result
+                // Saved matchresult
                 match_results_type m_MatchResults;
             };
 

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>

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 {

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>

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>
@@ -86,7 +86,7 @@ namespace boost {
 
         //! Find first algorithm ( case insensitive )
         /*!
-            Search for the first occurrence of the substring in the input. 
+            Search for the first occurence of the substring in the input. 
             Searching is case insensitive.
             
             \param Input A string which will be searched.
@@ -293,7 +293,7 @@ namespace boost {
             If the "token compress mode" is enabled, adjacent tokens are considered to be one match.
             
             \param Input A input string.
-            \param Pred A unary predicate to identify a token
+            \param Pred An unary predicate to identify a token
             \param eCompress Enable/Disable compressing of adjacent tokens
             \return 
                 An \c iterator_range delimiting the match. 

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>

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,12 +132,7 @@ namespace boost {
             // increment
             void increment()
             {
-                if(m_Match.begin() == m_Match.end())
-                    m_Match=this->do_find(m_Match.end(),m_End);
-                else {
-                    input_iterator_type last = m_Match.begin();
-                    m_Match=this->do_find(++last,m_End);
-                    }
+                m_Match=this->do_find(m_Match.end(),m_End);
             }
 
             // comparison

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>

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>
@@ -39,7 +39,7 @@ namespace boost {
             Constructs a \c const_formatter. Const formatter always returns
             the same value, regardless of the parameter.
 
-            \param Format A predefined value used as a result for formatting
+            \param Format A predefined value used as a result for formating
             \return An instance of the \c const_formatter object.
         */
         template<typename RangeT>
@@ -95,7 +95,7 @@ namespace boost {
             to extract a portion of the formatted sequence. The first finder's match is returned 
             as a result
 
-            \param Finder a finder used to select a portion of the formatted sequence
+            \param Finder a finder used to select a portion of the formated sequence
             \return An instance of the \c dissect_formatter object.
         */
         template<typename FinderT>

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>

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>

include/boost/algorithm/string/predicate_facade.hpp

@@ -15,7 +15,7 @@
 
 /*
  \file boost/algorith/string/predicate_facade.hpp
- This file contains predicate_facade definition. This template class is used
+ This file containes predicate_facade definition. This template class is used
  to identify classification predicates, so they can be combined using
  composition operators.
 */

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>

include/boost/algorithm/string/regex_find_format.hpp

@@ -32,7 +32,7 @@ namespace boost {
             Construct the \c regex_finder. Finder uses the regex engine to search
             for a match.
             Result is given in \c regex_search_result. This is an extension
-            of the iterator_range. In addition it contains match results 
+            of the iterator_range. In addition it containes match results 
             from the \c regex_search algorithm.
 
             \param Rx A regular expression

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>

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>
@@ -50,7 +50,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input range
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
             \return 
                 An output iterator pointing just after the last inserted character or
                 a copy of the input
@@ -118,7 +118,7 @@ namespace boost {
             The input sequence is modified in-place.
 
             \param Input An input sequence
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
         */
         template<typename SequenceT, typename PredicateT>
         inline void trim_left_if(SequenceT& Input, PredicateT IsSpace)
@@ -158,7 +158,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input range
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
             \return 
                 An output iterator pointing just after the last inserted character or
                 a copy of the input
@@ -228,7 +228,7 @@ namespace boost {
             The input sequence is modified in-place.
 
             \param Input An input sequence
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
         */
         template<typename SequenceT, typename PredicateT>
         inline void trim_right_if(SequenceT& Input, PredicateT IsSpace)
@@ -270,7 +270,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input range
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
             \return 
                 An output iterator pointing just after the last inserted character or
                 a copy of the input
@@ -352,7 +352,7 @@ namespace boost {
             The input sequence is modified in-place.
 
             \param Input An input sequence
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
         */
         template<typename SequenceT, typename PredicateT>
         inline void trim_if(SequenceT& Input, PredicateT IsSpace)

include/boost/algorithm/string/trim_all.hpp

@@ -49,7 +49,7 @@ namespace boost {
             The result is a trimmed copy of the input
 
             \param Input An input sequence
-             \param IsSpace A unary predicate identifying spaces
+             \param IsSpace An unary predicate identifying spaces
             \return A trimmed copy of the input
         */
         template<typename SequenceT, typename PredicateT>
@@ -70,7 +70,7 @@ namespace boost {
             The input sequence is modified in-place.
 
             \param Input An input sequence
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
         */
         template<typename SequenceT, typename PredicateT>
         inline void trim_all_if(SequenceT& Input, PredicateT IsSpace)
@@ -126,7 +126,7 @@ namespace boost {
 
             \param Input An input sequence
             \param Fill A string used to fill the inner spaces
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
             \return A trimmed copy of the input
         */
         template<typename SequenceT, typename RangeT, typename PredicateT>
@@ -149,7 +149,7 @@ namespace boost {
 
             \param Input An input sequence
             \param Fill A string used to fill the inner spaces
-            \param IsSpace A unary predicate identifying spaces
+            \param IsSpace An unary predicate identifying spaces
         */
         template<typename SequenceT, typename RangeT, typename PredicateT>
         inline void trim_fill_if(SequenceT& Input, const RangeT& Fill, PredicateT IsSpace)

include/boost/algorithm/string_regex.hpp

@@ -13,7 +13,7 @@
 
 /*! \file
     Cumulative include for string_algo library.
-    In addition to string.hpp contains also regex-related stuff.
+    In addtion to string.hpp contains also regex-related stuff.
 */
 
 #include <boost/regex.hpp>

include/boost/algorithm/wrappers.hpp

@@ -1,52 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 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)
-   
-   Alternate interfaces (aka "wrappers") for algorithms.
-*/
-
-#ifndef BOOST_ALGORITHM_WRAPPERS_HPP
-#define BOOST_ALGORITHM_WRAPPERS_HPP
-
-namespace boost { namespace algorithm {
-
-/// \fn find_ptr ( Container &c, Key k )
-/// \return a pointer to the value matching the key in the container, 
-/// or NULL if the key does not exist in the container.
-///
-/// \note: This is a wrapper around Container::find, with a useful interface.
-/// Suggested by Olaf van der Spek 
-/// 
-/// \param c    The container to be searched
-/// \param k    The key value to search with
-template <class Container, class Key>
-typename Container::value_type::second_type* 
-find_ptr ( Container &c, Key k )
-{
-    typename Container::iterator iter = c.find ( k );
-    return iter == c.end() ? NULL : &iter->second;
-}
-
-/// \fn find_ptr ( const Container &c, Key k )
-/// \return a pointer to the value matching the key in the container, 
-/// or NULL if the key does not exist in the container.
-///
-/// \note: This is a wrapper around Container::find, with a useful interface.
-/// Suggested by Olaf van der Spek 
-/// 
-/// \param c    The container to be searched
-/// \param k    The key value to search with
-template <class Container, class Key>
-const typename Container::value_type::second_type* 
-find_ptr ( const Container &c, Key k )
-{
-    typename Container::const_iterator iter = c.find ( k );
-    return iter == c.end() ? NULL : &iter->second;
-}
-
-
-}}
-
-#endif

minmax/index.html

@@ -350,7 +350,7 @@ separation into two header files.</p>
 std::max.</b></h4>
 <p>I am aware of the problems with std::min and
 std::max, and all the debate that has been going on (please consult
-<a href="#Alexandrescu">Alexandrescu's paper</a> and the links therein). But I don't see the purpose of this
+<a href="http://www.cuj.com/documents/s=7996/cujcexp1904alexandr/alexandr.htm">Alexandrescu's paper</a> and the links therein). But I don't see the purpose of this
 library as fixing something that is part of the C++ standard. I humbly
 think it's beyond the scope of this library. Rather, I am
 following the way of the standard in simply providing one more function
@@ -485,12 +485,7 @@ to keep it like this.
 <a name="acks">
 <h3>
 Acknowledgements</h3>
-
-<a name="Alexandrescu">
-<a href="http://www.drdobbs.com/generic-min-and-max-redivivus/184403774">Generic: Min and Max Redivivus, by Andrei Alexandrescu</a>
-Dr. Dobbs, April 2001
-
-<p>My students in CS903 (Polytechnic Univ., <a href="http://photon.poly.edu/~hbr/cs903/">http://photon.poly.edu/~hbr/cs903/</a>)
+My students in CS903 (Polytechnic Univ., <a href="http://photon.poly.edu/~hbr/cs903/">http://photon.poly.edu/~hbr/cs903/</a>)
 who had <tt>minmax_element</tt> as an assignment helped clarify the issues,
 and also come up with the optimum number of comparisons for <tt>first_min_last_max_element</tt>.
 The identification of the issue surrounding <tt>max_element</tt> is solely
@@ -521,7 +516,7 @@ Comparable</a></tt>,
 <tt><a href="http://www.sgi.com/tech/stl/nth_element.html">nth_element</a></tt>
 .
 <hr SIZE="6">
-<br>Last modified 2012-12-10
+<br>Last modified 2004-07-01
 <p><font face="Arial,Helvetica"><font size=-1>&copy; Copyright Herv&eacute;
 Br&ouml;nnimann, Polytechnic University, 2002--2004. 
 Use, modification, and distribution is subject to the Boost Software

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 ]      
    ;
 }

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;
 }

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;
 }

string/doc/concept.xml

@@ -162,8 +162,8 @@ boost::iterator_range<std::string> simple_finder(
 
         <para>
             Similarly to finders, formatters generalize format operations. When a finder is used to 
-            select a part of the input, formatter takes this selection and performs some formatting
-            on it. Algorithms can abstract from formatting using a formatter.
+            select a part of the input, formatter takes this selection and performs some formating
+            on it. Algorithms can abstract from formating using a formatter.
         </para>
         <para>
             <emphasis role="bold">Examples</emphasis>
@@ -171,7 +171,7 @@ boost::iterator_range&lt;std::string&gt; simple_finder(
         <para> 
             <itemizedlist>
                 <listitem>
-                    Formatter implemented as a class. This Formatter does not perform any formatting and 
+                    Formatter implemented as a class. This Formatter does not perform any formating and 
                     returns the match, repackaged. <code>operator()</code>
                     is templated, so that the Formatter can be used on any Finder type.
                     

string/doc/release_notes.xml

@@ -36,7 +36,7 @@
                     New comparison predicates <code>is_less</code>, <code>is_not_greater</code>
                 </listitem>
                 <listitem>
-                     Negative indexes support (like Perl) in various algorithms
+                     Negative indexes support (like Perl) in various algorihtms
                      (<code>*_head/tail</code>, <code>*_nth</code>).
                 </listitem>                                      
             </itemizedlist>

string/example/predicate_example.cpp

@@ -33,7 +33,7 @@ int main()
     cout << "str1 ends with \"123\": " << 
         (ends_with( str1, string("123") )?"true":"false") << endl; 
 
-    // Check if str1 contains 'xxx'
+    // Check if str1 containes 'xxx'
     cout << "str1 contains \"xxx\": " << 
         (contains( str1, string("xxx") )?"true":"false") << endl; 
 

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

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;
 }

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;
 }

string/test/find_test.cpp

@@ -9,11 +9,9 @@
 
 #include <boost/algorithm/string/find.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#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 +44,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 +65,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 +86,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 +124,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 +145,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 +167,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( 
@@ -195,7 +193,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( 
@@ -208,7 +206,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( 
@@ -221,7 +219,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() );
@@ -234,7 +232,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() );
@@ -250,24 +248,12 @@ void find_test()
     ostringstream osstr;
     osstr << find_first( str1, "abc" );
     BOOST_CHECK( osstr.str()=="abc" );
-
-    // Empty string test
-    BOOST_TEST_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;
 }

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;
 }

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;
 }

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>
@@ -115,7 +114,7 @@ static void replace_test()
     string fmt2("_xXx_");
     vector<int> vec1( str1.begin(), str1.end() );
 
-    // immutable tests
+    // inmutable tests
     
     // basic tests
     BOOST_CHECK( replace_regex_copy( str1, rx1, fmt1 )==string("123_A1C_xxxa23cXXXa456c321") );
@@ -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;
 }

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;
 }

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,
@@ -146,48 +144,30 @@ void iterator_test()
 
 
     find_iterator<string::iterator> fiter=make_find_iterator(str1, first_finder("xx"));
-    find_iterator<string::iterator> fiter2;
-    
     BOOST_CHECK(equals(*fiter, "xx"));
     ++fiter;
-    
-    fiter2 = fiter;
-    BOOST_CHECK(equals(*fiter,  "xx"));
-    BOOST_CHECK(equals(*fiter2, "xx"));
-
+    BOOST_CHECK(equals(*fiter, "xx"));
     ++fiter;
     BOOST_CHECK(fiter==find_iterator<string::iterator>());
-    BOOST_CHECK(equals(*fiter2, "xx"));
-
-    ++fiter2;
-    BOOST_CHECK(fiter2==find_iterator<string::iterator>());
 
     split_iterator<string::iterator> siter=make_split_iterator(str1, token_finder(is_any_of("-"), token_compress_on));
-    split_iterator<string::iterator> siter2;
     BOOST_CHECK(equals(*siter, "xx"));
     ++siter;
-
-    siter2 = siter;
-    BOOST_CHECK(equals(*siter,  "abc"));
-    BOOST_CHECK(equals(*siter2, "abc"));
-    
+    BOOST_CHECK(equals(*siter, "abc"));
     ++siter;
-    BOOST_CHECK(equals(*siter,  "xx"));
-    BOOST_CHECK(equals(*siter2, "abc"));
-    
+    BOOST_CHECK(equals(*siter, "xx"));
     ++siter;
     BOOST_CHECK(equals(*siter, "abb"));
     ++siter;
     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;
 }

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;
 }

test/Jamfile.v2

@@ -9,62 +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 : : : : ]
 
 # Clamp tests
-     [ run clamp_test.cpp unit_test_framework         : : : : clamp_test ]
+     [ 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 ]
-
-# Wrapper tests
-     [ run wrapper_test1.cpp unit_test_framework         : : : : wrapper_test1 ]
-
-# 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 ]
    ;
 }
 

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;
 }

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;
 }

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;
 }

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;
@@ -45,135 +42,46 @@ void test_copy_if ( Container const &c ) {
     ba::copy_if ( c, back_inserter ( v ), is_false);
     BOOST_CHECK ( v.size () == 0 );
 
-//  All the elements
+//	All the elements
     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
+//	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;
 }

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;
 }

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;
 }

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 ();
-}

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;
 }

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;
-}

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 ();
-}

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;
 }

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;
 }

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;
 }

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;
 }

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>
@@ -131,15 +129,17 @@ void test_nonhex_input4 () {
     }
 
 void test_nonhex_input () {
-//  BOOST_TEST_MESSAGE ( "Non hex input tests for boost::algorithm::unhex" );
+//  BOOST_TEST_MESSAGE ( "Non hex input tests for for boost::algorithm::unhex" );
     test_nonhex_input1 ();
     test_nonhex_input2 ();
     test_nonhex_input3 ();
     test_nonhex_input4 ();
     }
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
     test_short_input ();
     test_nonhex_input ();
+    
+  return 0;
 }

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;
 }

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;
 }

test/is_permutation_test1.cpp

@@ -11,103 +11,16 @@
 
 #include <boost/config.hpp>
 #include <boost/algorithm/cxx11/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 ();
@@ -129,7 +42,8 @@ void test_sequence1 () {
     }
 
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
   test_sequence1 ();
+  return 0;
 }

test/iterator_test.hpp

@@ -1,296 +0,0 @@
-#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

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 ();
-}

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;
 }

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;
 }

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;
 }

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;
 }

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>
@@ -93,7 +91,8 @@ void test_sequence1 () {
     }
 
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
   test_sequence1 ();
+  return 0;
 }

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;
 }

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;
 }

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;
 }

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;
     }

test/search_test2.cpp

@@ -11,13 +11,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>
 
-#include <ctime>        // for clock_t
 #include <iostream>
-#include <fstream>
-#include <iomanip>
 #include <algorithm>
 #include <vector>
 
@@ -126,7 +122,7 @@ namespace {
         }
     }
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
     vec c1  = ReadFromFile ( "search_test_data/0001.corpus" );
     vec p1b = ReadFromFile ( "search_test_data/0001b.pat" );
@@ -144,4 +140,6 @@ BOOST_AUTO_TEST_CASE( test_main )
     check_one ( c1, p1e, c1.size() - p1e.size ());  
     std::cout << "--- Not found ---" << std::endl;
     check_one ( c1, p1n, -1 );      //  Not found
+    
+    return 0;
     }

test/search_test3.cpp

@@ -11,13 +11,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>
 
-#include <ctime>        // for clock_t
 #include <iostream>
-#include <fstream>
-#include <iomanip>
 #include <algorithm>
 #include <vector>
 #include <string>
@@ -126,7 +122,7 @@ namespace {
         }
     }
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
     vec c1  = ReadFromFile ( "search_test_data/0001.corpus" );
     vec p1b = ReadFromFile ( "search_test_data/0002b.pat" );
@@ -144,4 +140,6 @@ BOOST_AUTO_TEST_CASE( test_main )
     check_one ( c1, p1e, c1.size() - p1e.size ());  
     std::cout << "--- Not found ---" << std::endl;
     check_one ( c1, p1n, -1 );      //  Not found
+    
+    return 0;
     }

test/search_test4.cpp

@@ -13,12 +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>
 
 #include <iostream>
-#include <fstream>
-#include <iomanip>
 #include <algorithm>
 #include <vector>
 #include <string>
@@ -96,7 +93,7 @@ namespace {
         
     }
 
-BOOST_AUTO_TEST_CASE( test_main )
+int test_main( int , char* [] )
 {
     vec c1  = ReadFromFile ( "search_test_data/0001.corpus" );
     vec p1b = ReadFromFile ( "search_test_data/0002b.pat" );
@@ -114,4 +111,6 @@ BOOST_AUTO_TEST_CASE( test_main )
     check_one ( c1, p1e, c1.size() - p1e.size ());  
     std::cout << "--- Not found ---" << std::endl;
     check_one ( c1, p1n, -1 );      //  Not found
+    
+    return 0;
     }

test/wrapper_test1.cpp

@@ -1,76 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 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 <boost/config.hpp>
-#include <boost/algorithm/wrappers.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-#include <functional>
-#include <string>
-#include <map>
-
-namespace ba = boost::algorithm;
-
-void test_int ()
-{
-    std::map<int, int> m;
-    std::multimap<int, int> mm;
-    
-    int *ptr;
-    
-//  try with an empty map
-    BOOST_CHECK ( ba::find_ptr ( m , 3 ) == NULL );
-    BOOST_CHECK ( ba::find_ptr ( mm, 3 ) == NULL );
-    
-    m.insert  ( std::make_pair <int, int> ( 5, 5 ));
-    mm.insert ( std::make_pair <int, int> ( 9, 9 ));
-    BOOST_CHECK ( ba::find_ptr ( m , 3 ) == NULL );
-    BOOST_CHECK ( ba::find_ptr ( mm, 3 ) == NULL );
-
-    ptr = ba::find_ptr ( m, 5 );
-    BOOST_CHECK ( ptr != NULL && *ptr == 5 );
-    BOOST_CHECK ( ba::find_ptr ( m , 9 ) == NULL );
-
-    ptr = ba::find_ptr ( mm, 9 );
-    BOOST_CHECK ( ptr != NULL && *ptr == 9 );
-    BOOST_CHECK ( ba::find_ptr ( mm, 5 ) == NULL );
-    
-}
-
-void test_str ()
-{
-    std::map<int, std::string> m;
-    std::multimap<int, std::string> mm;
-    std::string *ptr;
-
-//  try with an empty map
-    BOOST_CHECK ( ba::find_ptr ( m , 31 ) == NULL );
-    BOOST_CHECK ( ba::find_ptr ( mm, 31 ) == NULL );
-    
-    m.insert  ( std::make_pair <int, std::string> ( 55, "fifty-five" ));
-    mm.insert ( std::make_pair <int, std::string> ( 66, "sixty-six" ));
-    BOOST_CHECK ( ba::find_ptr ( m , 3 ) == NULL );
-    BOOST_CHECK ( ba::find_ptr ( mm, 3 ) == NULL );
-
-    ptr = ba::find_ptr ( m, 55 );
-    BOOST_CHECK ( ptr != NULL && *ptr == "fifty-five" );
-    BOOST_CHECK ( ba::find_ptr ( m , 66 ) == NULL );
-
-    ptr = ba::find_ptr ( mm, 66 );
-    BOOST_CHECK ( ptr != NULL && *ptr == "sixty-six" );
-    BOOST_CHECK ( ba::find_ptr ( mm, 55 ) == NULL );
-}
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-  test_int ();
-  test_str ();
-}