Quickbook: Merge from trunk.

Includes blocks in lists fixes, and some documentation changes.


[SVN r77347]

doc/Jamfile.v2

@@ -16,13 +16,11 @@ using quickbook ;
 using doxygen ;
 using boostbook ;
 
+local BOOST_ROOT = [ os.environ BOOST_ROOT ] ;
+
 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.
@@ -31,12 +29,14 @@ doxygen autodoc
 
 xml algorithm : algorithm.qbk ;
 
+# path-constant boost-images : $(BOOST_ROOT)/doc/src/images ;
+
 boostbook standalone
   :
     algorithm
   :
     <dependency>autodoc 
-    <xsl:param>boost.root=../../../..
+    <xsl:param>boost.root=$(BOOST_ROOT)
     <xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference"
     <xsl:param>chapter.autolabel=0
     <xsl:param>chunk.section.depth=8

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].
 
@@ -24,9 +24,7 @@ However, the Boyer-Moore 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".
 
-[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:
 ``
@@ -80,7 +78,7 @@ Both the object-oriented and procedural versions of the Boyer-Moore algorithm ta
 
 The Boyer-Moore object takes a traits template parameter which enables the caller to customize how one of the precomputed tables is stored. This table, called the skip table, contains (logically) one entry for every possible value that the pattern can contain. When searching 8-bit character data, this table contains 256 elements. The traits class defines the table to be used. 
 
-The default traits class uses a `boost::array` for small 'alphabets' and a `tr1::unordered_map` for larger ones.  The array-based skip table gives excellent performance, but could be prohibitively large when the 'alphabet' of elements to be searched grows. The unordered_map based version only grows as the number of unique elements in the pattern, but makes many more heap allocations, and gives slower lookup performance. 
+The default traits class uses a `boost::array` for small 'alphabets' and a `tr1::unordered_map` for larger ones.  The array-based skip table gives excellent performance, but could be prohibitively large when the "alphabet" of elements to be searched grows. The unordered_map based version only grows as the number of unique elements in the pattern, but makes many more heap allocations, and gives slower lookup performance. 
 
 To use a different skip table, you should define your own skip table object and your own traits class, and use them to instantiate the Boyer-Moore object. The interface to these objects is described TBD.
 

doc/boyer_moore_horspool.qbk

@@ -14,73 +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 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.
-
-The Boyer-Moore-Horspool 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 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.
-
-Here is the object interface:
-``
-template <typename patIter>
-class boyer_moore_horspool {
-public:
-    boyer_moore_horspool ( patIter first, patIter last );
-    ~boyer_moore_horspool ();
-    
-    template <typename corpusIter>
-    corpusIter operator () ( corpusIter corpus_first, corpusIter corpus_last );
-    };
-``
-
-and here is the corresponding procedural interface:
-
-``
-template <typename patIter, typename corpusIter>
-corpusIter boyer_moore_horspool_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 Boyer-Moore-Horspool algorithm is linear in the size of the string being searched; it can have a significantly lower constant factor than many other search algorithms: it doesn't need to check every character of the string to be searched, but rather skips over some of them. 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 internal table that has one entry for each member of the "alphabet" in the pattern. For (8-bit) character types, this table contains 256 entries.
-
-[heading Complexity]
-
-The worst-case performance is ['O(m x n)], where ['m] is the length of the pattern and ['n] is the length of the corpus. The average time is ['O(n)]. The best case performance is sub-linear, and is, in fact, identical to Boyer-Moore, but the initialization is quicker and the internal loop is simpler than Boyer-Moore.
-
-[heading Exception Safety]
-
-Both the object-oriented and procedural versions of the Boyer-Moore-Horspool 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 Boyer-Moore-Horspool algorithm requires random-access iterators for both the pattern and the corpus.
-
-[heading Customization points] 
-
-The Boyer-Moore-Horspool object takes a traits template parameter which enables the caller to customize how the precomputed table is stored. This table, called the skip table, contains (logically) one entry for every possible value that the pattern can contain. When searching 8-bit character data, this table contains 256 elements. The traits class defines the table to be used. 
-
-The default traits class uses a `boost::array` for small 'alphabets' and a `tr1::unordered_map` for larger ones.  The array-based skip table gives excellent performance, but could be prohibitively large when the 'alphabet' of elements to be searched grows. The unordered_map based version only grows as the number of unique elements in the pattern, but makes many more heap allocations, and gives slower lookup performance. 
-
-To use a different skip table, you should define your own skip table object and your own traits class, and use them to instantiate the Boyer-Moore-Horspool object. The interface to these objects is described TBD.
+The header file 'boyer_moore_horspool.hpp' contains an an implementation of the Boyer-Moore-Horspool algorithm for searching sequences of values. 
 
 
 [endsect]

doc/equal.qbk

@@ -1,80 +0,0 @@
-[/ File equal.qbk]
-
-[section:equal equal ]
-
-[/license
-Copyright (c) 2013 Marshall Clow
-
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-]
-
-The header file 'equal.hpp' contains two variants of a the stl algorithm `equal`. The algorithm tests to see if two sequences contain equal values;  
-
-Before (the proposed) C++14 the algorithm `std::equal` took three iterators and an optional comparison predicate. The first two iterators `[first1, last1)` defined a sequence, and the second one `first2` defined the start of the second sequence. The second sequence was assumed to be the same length as the first. 
-
-In C++14, two new variants were introduced, taking four iterators and an optional comparison predicate. The four iterators define two sequences `[first1, last1)` and `[first2, last2)` explicitly, rather than defining the second one implicitly. This leads to correct answers in more cases (and avoid undefined behavior in others).
-
-Consider the two sequences:
-```
-	auto seq1 = { 0, 1, 2 };
-	auto seq2 = { 0, 1, 2, 3, 4 };
-	
-	std::equal ( seq1.begin (), seq1.end (), seq2.begin ()); // true
-	std::equal ( seq2.begin (), seq2.end (), seq1.begin ()); // Undefined behavior
-	std::equal ( seq1.begin (), seq1.end (), seq2.begin (), seq2.end ()); // false
-```
-
-You can argue that `true` is the correct answer in the first case, even though the sequences are not the same. The first N entries in `seq2` are the same as the entries in `seq1` - but that's not all that's in `seq2`. But in the second case, the algorithm will read past the end of `seq1`, resulting in undefined behavior (large earthquake, incorrect results, pregnant cat, etc).
-
-However, if the two sequences are specified completely, it's clear that they are not equal.
-
-[heading interface]
-
-The function `equal` returns true if the two sequences compare equal; i.e, if each element in the sequence compares equal to the corresponding element in the other sequence. One version uses `std::equal_to` to do the comparison; the other lets the caller pass predicate to do the comparisons. 
-
-``
-template <class InputIterator1, class InputIterator2>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2 );
-             
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-bool equal ( InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred );
-``
-
-[heading Examples]
-
-Given the container `c1` containing `{ 0, 1, 2, 3, 14, 15 }`, and `c2` containing `{ 1, 2, 3 }`,  then
-``
-equal ( c1.begin (),     c1.end (),       c2.begin (), c2.end ()) --> false
-equal ( c1.begin () + 1, c1.begin () + 3, c2.begin (), c2.end ()) --> true
-equal ( c1.end (),       c1.end (),       c2.end (),   c2.end ()) --> true  // empty sequences are alway equal to each other
-``
-
-[heading Iterator Requirements]
-
-`equal` works on all iterators except output iterators.
-
-[heading Complexity]
-
-Both of the variants of `equal` run in ['O(N)] (linear) time; that is, they compare against each element in the list once. If the sequence is found to be not equal at any point, the routine will terminate immediately, without examining the rest of the elements.
-
-[heading Exception Safety]
-
-Both of the variants of `equal` take their parameters by value and do not depend upon any global state. Therefore, all the routines in this file provide the strong exception guarantee.
-
-[heading Notes]
-
-* The four iterator version of the routine `equal` is part of the C++14 standard. When C++14 standard library implementations become available, the implementation from the standard library should be used.
-
-* `equal` returns true for two empty ranges, no matter what predicate is passed to test against. 
-
-[endsect]
-
-[/ File equal.qbk
-Copyright 2011 Marshall Clow
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
-]
-

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/hex.qbk

@@ -66,12 +66,12 @@ If you want to catch all the decoding errors, you can catch exceptions of type `
 Assuming that `out` is an iterator that accepts `char` values, and `wout` accepts `wchar_t` values (and that sizeof ( wchar_t ) == 2)
 
 ``
-hex ( "abcdef", out )  --> "616263646566"
+hex ( "abcde", out )  --> "616263646566"
 hex ( "32", out )     --> "3332"
-hex ( "abcdef", wout ) --> "006100620063006400650066"
+hex ( "abcde", wout ) --> "006100620063006400650066"
 hex ( "32", wout )    --> "00330032"
 
-unhex ( "616263646566", out )  --> "abcdef"
+unhex ( "616263646566", out )  --> "abcde"
 unhex ( "3332", out )          --> "32"
 unhex ( "616263646566", wout ) --> "\6162\6364\6566"	( i.e, a 3 character string )
 unhex ( "3332", wout )         --> "\3233"				( U+3332, SQUARE HUARADDO )

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 (), seq2.begin (), seq2.end ()); // <3, 3>
-```
-
-The first N entries in `seq2` are the same as the entries in `seq1` - but that's not all that's in `seq2`. In the second case, the algorithm will read past the end of `seq1`, resulting in undefined behavior (large earthquake, incorrect results, pregnant cat, etc).
-
-However, if the two sequences are specified completely, it's clear that where the mismatch occurs.
-
-[heading interface]
-
-The function `mismatch` returns a pair of iterators which denote the first mismatching elements in each sequence. If the sequences match completely, `mismatch` returns their end iterators. One version uses `std::equal_to` to do the comparison; the other lets the caller pass predicate to do the comparisons. 
-
-``
-template <class InputIterator1, class InputIterator2>
-std::pair<InputIterator1, InputIterator2>
-mismatch ( InputIterator1 first1, InputIterator1 last1, 
-           InputIterator2 first2, InputIterator2 last2 );
-             
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-std::pair<InputIterator1, InputIterator2>
-mismatch ( InputIterator1 first1, InputIterator1 last1, 
-           InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred );
-``
-
-[heading Examples]
-
-Given the container `c1` containing `{ 0, 1, 2, 3, 14, 15 }`, and `c2` containing `{ 1, 2, 3 }`,  then
-``
-mismatch ( c1.begin(),     c1.end(),       c2.begin(), c2.end()) --> <c1.begin(), c2.begin()> // first elements do not match
-mismatch ( c1.begin() + 1, c1.begin() + 4, c2.begin(), c2.end()) --> <c1.begin() + 4, c2.end ()> // all elements of `c2` match
-mismatch ( c1.end(),       c1.end(),       c2.end(),   c2.end()) --> <c1.end(), c2.end()> // empty sequences don't match at the end.
-``
-
-[heading Iterator Requirements]
-
-`mismatch` works on all iterators except output iterators.
-
-[heading Complexity]
-
-Both of the variants of `mismatch` run in ['O(N)] (linear) time; that is, they compare against each element in the list once. If the sequence is found to be not equal at any point, the routine will terminate immediately, without examining the rest of the elements.
-
-[heading Exception Safety]
-
-Both of the variants of `mismatch` take their parameters by value and do not depend upon any global state. Therefore, all the routines in this file provide the strong exception guarantee.
-
-[heading Notes]
-
-* If the sequences are equal (or both are empty), then mismatch returns the end iterators of both sequences. 
-
-* The four iterator version of the routine `mismatch` is part of the C++14 standard. When C++14 standard library implementations become available, the implementation from the standard library should be used.
-
-[endsect]
-
-[/ File mismatch.qbk
-Copyright 2011 Marshall Clow
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
-]
-

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

@@ -19,11 +19,11 @@ The function `is_sorted(sequence)` determines whether or not a sequence is compl
 
 ``
 namespace boost { namespace algorithm {
-	template <typename ForwardIterator, typename Pred>
-	bool is_sorted ( ForwardIterator first, ForwardIterator last, Pred p );
+	template <typename Iterator, typename Pred>
+	bool is_sorted ( Iterator first, Iterator last, Pred p );
 	
-	template <typename ForwardIterator>
-	bool is_sorted ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_sorted ( Iterator first, Iterator last );
 	
 	
 	template <typename Range, typename Pred>
@@ -34,13 +34,11 @@ namespace boost { namespace algorithm {
 }}
 ``
 
-Iterator requirements: The `is_sorted` functions will work forward iterators or better.
+Iterator requirements: The `is_sorted` functions will work on all kinds of iterators (except output iterators). 
 
 [heading is_sorted_until]
 
-If `distance(first, last) < 2`, then `is_sorted ( first, last )` returns `last`. Otherwise, it returns the last iterator i in [first,last] for which the range [first,i) is sorted.
-
-In short, it returns the element in the sequence that is "out of order". If the entire sequence is sorted (according to the predicate), then it will return `last`.
+The function `is_sorted_until(sequence, predicate)` compares each sequential pair of elements in the sequence, checking if they satisfy the predicate. it returns the first element of the sequence that does not satisfy the predicate with its' predecessor. In short, it returns the element in the sequence that is "out of order". If all adjacent pairs satisfy the predicate, then it will return one past the last element of the sequence. 
 
 ``
 namespace boost { namespace algorithm {
@@ -73,7 +71,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,34 +82,34 @@ 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 {
-	template <typename ForwardIterator>
-	bool is_decreasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_decreasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_decreasing ( const R &range );
 }}
 ``
 
-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 ForwardIterator>
-	bool is_strictly_increasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_strictly_increasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_strictly_increasing ( const R &range );
 }}
 ``
 
-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 ForwardIterator>
-	bool is_strictly_decreasing ( ForwardIterator first, ForwardIterator last );
+	template <typename Iterator>
+	bool is_strictly_decreasing ( Iterator first, Iterator last );
 	
 	template <typename R>
 	bool is_strictly_decreasing ( const R &range );

include/boost/algorithm/algorithm.hpp

@@ -1,86 +0,0 @@
-/* 
-   Copyright (c) Marshall Clow 2014.
-
-   Distributed under the Boost Software License, Version 1.0. (See accompanying
-   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
- Revision history:
-    2 Dec 2014 mtc First version; power
-   
-*/
-
-/// \file algorithm.hpp
-/// \brief Misc Algorithms
-/// \author Marshall Clow
-///
-
-#ifndef BOOST_ALGORITHM_HPP
-#define BOOST_ALGORITHM_HPP
-
-#include <boost/utility/enable_if.hpp> // for boost::disable_if
-#include <boost/type_traits/is_integral.hpp>
-
-namespace boost { namespace algorithm {
-
-template <typename T>
-T identity_operation ( std::multiplies<T> ) { return T(1); }
-
-template <typename T>
-T identity_operation ( std::plus<T> ) { return T(0); }
-
-
-/// \fn power ( T x, Integer n )
-/// \return the value "x" raised to the power "n"
-/// 
-/// \param x     The value to be exponentiated
-/// \param n     The exponent (must be >= 0)
-///
-//  \remark Taken from Knuth, The Art of Computer Programming, Volume 2:
-//  Seminumerical Algorithms, Section 4.6.3
-template <typename T, typename Integer>
-typename boost::enable_if<boost::is_integral<Integer>, T>::type
-power (T x, Integer n) {
-    T y = 1; // Should be "T y{1};" 
-    if (n == 0) return y;
-    while (true) {
-        if (n % 2 == 1) {
-            y = x * y;
-            if (n == 1)
-                return y;
-            }
-        n = n / 2;
-        x = x * x;
-        }
-    return y;
-    }
-
-/// \fn power ( T x, Integer n, Operation op )
-/// \return the value "x" raised to the power "n"
-/// using the operaton "op".
-/// 
-/// \param x     The value to be exponentiated
-/// \param n     The exponent (must be >= 0)
-/// \param op    The operation used
-///
-//  \remark Taken from Knuth, The Art of Computer Programming, Volume 2:
-//  Seminumerical Algorithms, Section 4.6.3
-template <typename T, typename Integer, typename Operation>
-typename boost::enable_if<boost::is_integral<Integer>, T>::type
-power (T x, Integer n, Operation op) {
-    T y = identity_operation(op);
-    if (n == 0) return y;
-    while (true) {
-        if (n % 2 == 1) {
-            y = op(x, y);
-            if (n == 1)
-                return y;
-            }
-        n = n / 2;
-        x = op(x, x);
-        }
-    return y;
-    }
-
-}}
-
-#endif // BOOST_ALGORITHM_HPP

include/boost/algorithm/clamp.hpp

@@ -31,8 +31,8 @@
 namespace boost { namespace algorithm {
 
 /// \fn clamp ( T const& val, 
-///               typename boost::mpl::identity<T>::type const & lo, 
-///               typename boost::mpl::identity<T>::type const & hi, Pred p )
+///               typename boost::mpl::identity<T>::type const& lo, 
+///               typename boost::mpl::identity<T>::type const& hi, Pred p )
 /// \return the value "val" brought into the range [ lo, hi ]
 ///     using the comparison predicate p.
 ///     If p ( val, lo ) return lo.
@@ -56,8 +56,8 @@ namespace boost { namespace algorithm {
 
 
 /// \fn clamp ( T const& val, 
-///               typename boost::mpl::identity<T>::type const & lo, 
-///               typename boost::mpl::identity<T>::type const & hi )
+///               typename boost::mpl::identity<T>::type const& lo, 
+///               typename boost::mpl::identity<T>::type const& hi )
 /// \return the value "val" brought into the range [ lo, hi ].
 ///     If the value is less than lo, return lo.
 ///     If the value is greater than "hi", return hi.
@@ -76,8 +76,8 @@ namespace boost { namespace algorithm {
   } 
 
 /// \fn clamp_range ( InputIterator first, InputIterator last, OutputIterator out, 
-///       std::iterator_traits<InputIterator>::value_type const & lo, 
-///       std::iterator_traits<InputIterator>::value_type const & hi )
+///       std::iterator_traits<InputIterator>::value_type lo, 
+///       std::iterator_traits<InputIterator>::value_type hi )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 /// 
 /// \param first The start of the range of values
@@ -88,8 +88,8 @@ namespace boost { namespace algorithm {
 ///
   template<typename InputIterator, typename OutputIterator> 
   OutputIterator clamp_range ( InputIterator first, InputIterator last, OutputIterator out,
-    typename std::iterator_traits<InputIterator>::value_type const & lo, 
-    typename std::iterator_traits<InputIterator>::value_type const & hi )
+    typename std::iterator_traits<InputIterator>::value_type lo, 
+    typename std::iterator_traits<InputIterator>::value_type hi )
   {
   // this could also be written with bind and std::transform
     while ( first != last )
@@ -98,8 +98,8 @@ namespace boost { namespace algorithm {
   } 
 
 /// \fn clamp_range ( const Range &r, OutputIterator out, 
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo,
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi )
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 /// 
 /// \param r     The range of values to be clamped
@@ -110,16 +110,16 @@ namespace boost { namespace algorithm {
   template<typename Range, typename OutputIterator> 
   typename boost::disable_if_c<boost::is_same<Range, OutputIterator>::value, OutputIterator>::type
   clamp_range ( const Range &r, OutputIterator out,
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo, 
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi )
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo, 
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi )
   {
     return clamp_range ( boost::begin ( r ), boost::end ( r ), out, lo, hi );
   } 
 
 
 /// \fn clamp_range ( InputIterator first, InputIterator last, OutputIterator out, 
-///       std::iterator_traits<InputIterator>::value_type const & lo, 
-///       std::iterator_traits<InputIterator>::value_type const & hi, Pred p )
+///       std::iterator_traits<InputIterator>::value_type lo, 
+///       std::iterator_traits<InputIterator>::value_type hi, Pred p )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 ///     using the comparison predicate p.
 /// 
@@ -134,8 +134,8 @@ namespace boost { namespace algorithm {
 ///
   template<typename InputIterator, typename OutputIterator, typename Pred> 
   OutputIterator clamp_range ( InputIterator first, InputIterator last, OutputIterator out,
-    typename std::iterator_traits<InputIterator>::value_type const & lo, 
-    typename std::iterator_traits<InputIterator>::value_type const & hi, Pred p )
+    typename std::iterator_traits<InputIterator>::value_type lo, 
+    typename std::iterator_traits<InputIterator>::value_type hi, Pred p )
   {
   // this could also be written with bind and std::transform
     while ( first != last )
@@ -144,8 +144,8 @@ namespace boost { namespace algorithm {
   } 
 
 /// \fn clamp_range ( const Range &r, OutputIterator out, 
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo,
-///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo,
+///       typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi,
 ///       Pred p )
 /// \return clamp the sequence of values [first, last) into [ lo, hi ]
 ///     using the comparison predicate p.
@@ -162,8 +162,8 @@ namespace boost { namespace algorithm {
   template<typename Range, typename OutputIterator, typename Pred> 
   typename boost::disable_if_c<boost::is_same<Range, OutputIterator>::value, OutputIterator>::type
   clamp_range ( const Range &r, OutputIterator out,
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & lo, 
-    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type const & hi,
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type lo, 
+    typename std::iterator_traits<typename boost::range_iterator<const Range>::type>::value_type hi,
     Pred p )
   {
     return clamp_range ( boost::begin ( r ), boost::end ( r ), out, lo, hi, p );

include/boost/algorithm/cxx11/all_of.hpp

@@ -12,12 +12,15 @@
 #ifndef BOOST_ALGORITHM_ALL_OF_HPP
 #define BOOST_ALGORITHM_ALL_OF_HPP
 
-#include <algorithm>    // for std::all_of, if available
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of all_of if it is available
+using std::all_of;      // Section 25.2.1
+#else
 /// \fn all_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if all elements in [first, last) satisfy the predicate 'p'
 /// \note returns true on an empty range
@@ -37,6 +40,7 @@ bool all_of ( InputIterator first, InputIterator last, Predicate p )
             return false;
     return true; 
 } 
+#endif
 
 /// \fn all_of ( const Range &r, Predicate p )
 /// \return true if all elements in the range satisfy the predicate 'p'

include/boost/algorithm/cxx11/any_of.hpp

@@ -14,12 +14,15 @@
 #ifndef BOOST_ALGORITHM_ANY_OF_HPP
 #define BOOST_ALGORITHM_ANY_OF_HPP
 
-#include <algorithm>    // for std::any_of, if available
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+//  Use the C++11 versions of any_of if it is available
+#if __cplusplus >= 201103L
+using std::any_of;      // Section 25.2.2
+#else
 /// \fn any_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if any of the elements in [first, last) satisfy the predicate
 /// \note returns false on an empty range
@@ -36,6 +39,7 @@ bool any_of ( InputIterator first, InputIterator last, Predicate p )
             return true;
     return false; 
 } 
+#endif
 
 /// \fn any_of ( const Range &r, Predicate p )
 /// \return true if any elements in the range satisfy the predicate 'p'

include/boost/algorithm/cxx11/copy_if.hpp

@@ -12,12 +12,16 @@
 #ifndef BOOST_ALGORITHM_COPY_IF_HPP
 #define BOOST_ALGORITHM_COPY_IF_HPP
 
-#include <algorithm>    // for std::copy_if, if available
+#include <algorithm>	// for std::copy_if, if available
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of copy_if if it is available
+using std::copy_if;         // Section 25.3.1
+#else
 /// \fn copy_if ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 /// \brief Copies all the elements from the input range that satisfy the
 /// predicate to the output range.
@@ -35,9 +39,10 @@ OutputIterator copy_if ( InputIterator first, InputIterator last, OutputIterator
 {
     for ( ; first != last; ++first )
         if (p(*first))
-            *result++ = *first;
+            *result++ = first;
     return result;
 }
+#endif
 
 /// \fn copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \brief Copies all the elements from the input range that satisfy the
@@ -58,7 +63,7 @@ OutputIterator copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \fn copy_while ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 /// \brief Copies all the elements at the start of the input range that
 ///     satisfy the predicate to the output range.
-/// \return The updated input and output iterators
+/// \return The updated output iterator
 /// 
 /// \param first    The start of the input sequence
 /// \param last     One past the end of the input sequence
@@ -66,26 +71,25 @@ OutputIterator copy_if ( const Range &r, OutputIterator result, Predicate p )
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename InputIterator, typename OutputIterator, typename Predicate> 
-std::pair<InputIterator, OutputIterator>
-copy_while ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
+OutputIterator copy_while ( InputIterator first, InputIterator last, 
+                                OutputIterator result, Predicate p )
 {
     for ( ; first != last && p(*first); ++first )
-        *result++ = *first;
-    return std::make_pair(first, result);
+        *result++ = first;
+    return result;
 }
 
 /// \fn copy_while ( const Range &r, OutputIterator result, Predicate p )
 /// \brief Copies all the elements at the start of the input range that
 ///     satisfy the predicate to the output range.
-/// \return The updated input and output iterators
+/// \return The updated output iterator
 /// 
 /// \param r        The input range
 /// \param result   An output iterator to write the results into
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename Range, typename OutputIterator, typename Predicate>
-std::pair<typename boost::range_iterator<const Range>::type, OutputIterator> 
-copy_while ( const Range &r, OutputIterator result, Predicate p )
+OutputIterator copy_while ( const Range &r, OutputIterator result, Predicate p )
 {
     return boost::algorithm::copy_while (boost::begin (r), boost::end(r), result, p);
 }
@@ -102,12 +106,11 @@ copy_while ( const Range &r, OutputIterator result, Predicate p )
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename InputIterator, typename OutputIterator, typename Predicate> 
-std::pair<InputIterator, OutputIterator>
-copy_until ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
+OutputIterator copy_until ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
 {
     for ( ; first != last && !p(*first); ++first )
-        *result++ = *first;
-    return std::make_pair(first, result);
+        *result++ = first;
+    return result;
 }
 
 /// \fn copy_until ( const Range &r, OutputIterator result, Predicate p )
@@ -120,8 +123,7 @@ copy_until ( InputIterator first, InputIterator last, OutputIterator result, Pre
 /// \param p        A predicate for testing the elements of the range
 ///
 template<typename Range, typename OutputIterator, typename Predicate>
-std::pair<typename boost::range_iterator<const Range>::type, OutputIterator> 
-copy_until ( const Range &r, OutputIterator result, Predicate p )
+OutputIterator copy_until ( const Range &r, OutputIterator result, Predicate p )
 {
     return boost::algorithm::copy_until (boost::begin (r), boost::end(r), result, p);
 }

include/boost/algorithm/cxx11/copy_n.hpp

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

include/boost/algorithm/cxx11/find_if_not.hpp

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

include/boost/algorithm/cxx11/iota.hpp

@@ -19,6 +19,10 @@
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of iota if it is available
+using std::iota;      // Section 26.7.6
+#else
 /// \fn iota ( ForwardIterator first, ForwardIterator last, T value )
 /// \brief Generates an increasing sequence of values, and stores them in [first, last)
 /// 
@@ -34,6 +38,7 @@ void iota ( ForwardIterator first, ForwardIterator last, T value )
     for ( ; first != last; ++first, ++value )
         *first = value;
 }
+#endif
 
 /// \fn iota ( Range &r, T value )
 /// \brief Generates an increasing sequence of values, and stores them in the input Range.
@@ -58,12 +63,12 @@ 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;
 }
 
 }}
 
-#endif  // BOOST_ALGORITHM_IOTA_HPP
+#endif  // BOOST_ALGORITHM_IOTA_HPP

include/boost/algorithm/cxx11/is_partitioned.hpp

@@ -12,41 +12,46 @@
 #ifndef BOOST_ALGORITHM_IS_PARTITIONED_HPP
 #define BOOST_ALGORITHM_IS_PARTITIONED_HPP
 
-#include <algorithm>    // for std::is_partitioned, if available
+#include <algorithm>	// for std::is_partitioned, if available
 
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of iota if it is available
+using std::is_partitioned;      // Section 25.3.13
+#else
 /// \fn is_partitioned ( InputIterator first, InputIterator last, UnaryPredicate p )
-/// \brief Tests to see if a sequence is partitioned according to a predicate
+/// \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.
 template <typename InputIterator, typename UnaryPredicate>
 bool is_partitioned ( InputIterator first, InputIterator last, UnaryPredicate p )
 {
-//  Run through the part that satisfy the predicate
+//	Run through the part that satisfy the predicate
     for ( ; first != last; ++first )
         if ( !p (*first))
-            break;
-//  Now the part that does not satisfy the predicate
+        	break;
+//	Now the part that does not satisfy the predicate
     for ( ; first != last; ++first )
         if ( p (*first))
-            return false;
+        	return false;
     return true;
 }
+#endif
 
 /// \fn is_partitioned ( const Range &r, UnaryPredicate p )
 /// \brief Generates an increasing sequence of values, and stores them in the input Range.
 /// 
 /// \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 )
@@ -57,4 +62,4 @@ bool is_partitioned ( const Range &r, UnaryPredicate p )
 
 }}
 
-#endif  // BOOST_ALGORITHM_IS_PARTITIONED_HPP
+#endif  // BOOST_ALGORITHM_IS_PARTITIONED_HPP

include/boost/algorithm/cxx11/is_permutation.hpp

@@ -9,8 +9,8 @@
 /// \brief Is a sequence a permutation of another sequence
 /// \author Marshall Clow
 
-#ifndef BOOST_ALGORITHM_IS_PERMUTATION11_HPP
-#define BOOST_ALGORITHM_IS_PERMUTATION11_HPP
+#ifndef BOOST_ALGORITHM_IS_PERMUTATION_HPP
+#define BOOST_ALGORITHM_IS_PERMUTATION_HPP
 
 #include <algorithm>    // for std::less, tie, mismatch and is_permutation (if available)
 #include <utility>      // for std::make_pair
@@ -21,9 +21,14 @@
 #include <boost/range/end.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/tr1/tr1/tuple>      // for tie
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of is_permutation if it is available
+using std::is_permutation;              // Section 25.2.12
+#else
 /// \cond DOXYGEN_HIDE
 namespace detail {
     template <typename Predicate, typename Iterator>
@@ -33,77 +38,18 @@ namespace detail {
         template <typename T1>
         bool operator () ( const T1 &t1 ) const { return p_ ( *it_, t1 ); }
     private:
-        Predicate p_;
+        Predicate &p_;
         Iterator it_;
         };
-        
-//  Preconditions:
-//  1. The sequences are the same length
-//  2. Any common elements on the front have been removed (not necessary for correctness, just for performance)
-    template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-    bool is_permutation_inner ( ForwardIterator1 first1, ForwardIterator1 last1,
-                                ForwardIterator2 first2, ForwardIterator2 last2,
-                                BinaryPredicate p ) {
-        //  for each unique value in the sequence [first1,last1), count how many times
-        //  it occurs, and make sure it occurs the same number of times in [first2, last2)
-            for ( ForwardIterator1 iter = first1; iter != last1; ++iter ) {
-                value_predicate<BinaryPredicate, ForwardIterator1> pred ( p, iter );
-
-            /*  For each value we haven't seen yet... */
-                if ( std::find_if ( first1, iter, pred ) == iter ) {
-                    std::size_t dest_count = std::count_if ( first2, last2, pred );
-                    if ( dest_count == 0 || dest_count != (std::size_t) std::count_if ( iter, last1, pred ))
-                        return false;
-                    }
-                }
-
-        return true;
-        }                      
-
-    template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool is_permutation_tag ( ForwardIterator1 first1, ForwardIterator1 last1, 
-                          ForwardIterator2 first2, ForwardIterator2 last2, 
-                          BinaryPredicate p,
-                          std::forward_iterator_tag, std::forward_iterator_tag ) {
-
-    //  Skip the common prefix (if any)
-        while ( first1 != last1 && first2 != last2 && p ( *first1, *first2 )) {
-            ++first1;
-            ++first2;
-            }
-        if ( first1 != last1 && first2 != last2 )
-            return boost::algorithm::detail::is_permutation_inner ( first1, last1, first2, last2,
-                std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
-        return first1 == last1 && first2 == last2;
-        }
-
-    template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
-    bool is_permutation_tag ( RandomAccessIterator1 first1, RandomAccessIterator1 last1, 
-                          RandomAccessIterator2 first2, RandomAccessIterator2 last2, 
-                          BinaryPredicate p,
-                          std::random_access_iterator_tag, std::random_access_iterator_tag ) {
-    //  Cheap check
-        if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
-            return false;
-    //  Skip the common prefix (if any)
-        while ( first1 != last1 && first2 != last2 && p ( *first1, *first2 )) {
-            ++first1;
-            ++first2;
-            }
-
-        if ( first1 != last1 && first2 != last2 )
-            return is_permutation_inner (first1, last1, first2, last2, p);
-        return first1 == last1 && first2 == last2;
-        }
-
 }
 /// \endcond
 
+
 /// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2, BinaryPredicate p )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
+/// \brief Tests to see if a the sequence [first,last) is a permutation of the sequence starting at first2
 ///
-/// \param first1   The start of the input sequence
-/// \param last1    One past the end of the input sequence
+/// \param first    The start of the input sequence
+/// \param last     One past the end of the input sequence
 /// \param first2   The start of the second sequence
 /// \param p        The predicate to compare elements with
 ///
@@ -115,6 +61,7 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
                       ForwardIterator2 first2, BinaryPredicate p )
 {
 //  Skip the common prefix (if any)
+//  std::tie (first1, first2) = std::mismatch (first1, last1, first2, p);
     std::pair<ForwardIterator1, ForwardIterator2> eq = std::mismatch (first1, last1, first2, p);
     first1 = eq.first;
     first2 = eq.second;
@@ -122,43 +69,46 @@ 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;
 }
 
 /// \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
+/// \brief Tests to see if a the sequence [first,last) is a permutation of the sequence starting at first2
 ///
-/// \param first1   The start of the input sequence
-/// \param last2    One past the end of the input sequence
+/// \param first    The start of the input sequence
+/// \param last     One past the end of the input sequence
 /// \param first2   The start of the second sequence
 /// \note           This function is part of the C++2011 standard library.
 ///  We will use the standard one if it is available,
 ///     otherwise we have our own implementation.
 template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2 )
+bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 )
 {
 //  How should I deal with the idea that ForwardIterator1::value_type
 //  and ForwardIterator2::value_type could be different? Define my own comparison predicate?
-//  Skip the common prefix (if any)
-    std::pair<ForwardIterator1, ForwardIterator2> eq = std::mismatch (first1, last1, first2 );
-    first1 = eq.first;
-    first2 = eq.second;
-    if ( first1 != last1 ) {
-    //  Create last2
-        ForwardIterator2 last2 = first2;
-        std::advance ( last2, std::distance (first1, last1));
-        return boost::algorithm::detail::is_permutation_inner ( first1, last1, first2, last2,
-            std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
-        }
-    return true;
+    return boost::algorithm::is_permutation ( first, last, first2,
+                          std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
 }
 
+#endif
 
 /// \fn is_permutation ( const Range &r, ForwardIterator first2 )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
+/// \brief Tests to see if a the sequence [first,last) is a permutation of the sequence starting at first2
 ///
 /// \param r        The input range
 /// \param first2   The start of the second sequence
@@ -169,7 +119,7 @@ bool is_permutation ( const Range &r, ForwardIterator first2 )
 }
 
 /// \fn is_permutation ( const Range &r, ForwardIterator first2, BinaryPredicate pred )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
+/// \brief Tests to see if a the sequence [first,last) is a permutation of the sequence starting at first2
 ///
 /// \param r        The input range
 /// \param first2   The start of the second sequence
@@ -186,4 +136,4 @@ is_permutation ( const Range &r, ForwardIterator first2, BinaryPredicate pred )
 
 }}
 
-#endif  // BOOST_ALGORITHM_IS_PERMUTATION11_HPP
+#endif  // BOOST_ALGORITHM_IS_PERMUTATION_HPP

include/boost/algorithm/cxx11/is_sorted.hpp

@@ -26,6 +26,11 @@
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of iota if it is available
+using std::is_sorted_until; // Section 25.4.1.5
+using std::is_sorted;       // Section 25.4.1.5
+#else
 /// \fn is_sorted_until ( ForwardIterator first, ForwardIterator last, Pred p )
 /// \return the point in the sequence [first, last) where the elements are unordered
 ///     (according to the comparison predicate 'p').
@@ -41,7 +46,7 @@ namespace boost { namespace algorithm {
         ForwardIterator next = first;
         while ( ++next != last )
         {
-            if ( p ( *next, *first ))
+            if ( !p ( *first, *next ))
                 return next;
             first = next;
         }
@@ -58,7 +63,7 @@ namespace boost { namespace algorithm {
     ForwardIterator is_sorted_until ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return boost::algorithm::is_sorted_until ( first, last, std::less<value_type>());
+        return boost::algorithm::is_sorted_until ( first, last, std::less_equal<value_type>());
     }
 
 
@@ -86,9 +91,10 @@ namespace boost { namespace algorithm {
     {
         return boost::algorithm::is_sorted_until (first, last) == last;
     }
+#endif
 
 ///
-/// -- Range based versions of the C++11 functions
+///	-- Range based versions of the C++11 functions
 ///
 
 /// \fn is_sorted_until ( const R &range, Pred p )
@@ -119,6 +125,10 @@ namespace boost { namespace algorithm {
         return boost::algorithm::is_sorted_until ( boost::begin ( range ), boost::end ( range ));
     }
 
+namespace detail {
+	typedef struct { typedef bool type; } bool_;
+};
+
 /// \fn is_sorted ( const R &range, Pred p )
 /// \return whether or not the entire range R is sorted
 ///     (according to the comparison predicate 'p').
@@ -147,7 +157,7 @@ namespace boost { namespace algorithm {
 
 
 ///
-/// -- Range based versions of the C++11 functions
+///	-- Range based versions of the C++11 functions
 ///
 
 /// \fn is_increasing ( ForwardIterator first, ForwardIterator last )
@@ -163,7 +173,7 @@ namespace boost { namespace algorithm {
     bool is_increasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return boost::algorithm::is_sorted (first, last, std::less<value_type>());
+        return boost::algorithm::is_sorted (first, last, std::less_equal<value_type>());
     }
 
 
@@ -196,7 +206,7 @@ namespace boost { namespace algorithm {
     bool is_decreasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return boost::algorithm::is_sorted (first, last, std::greater<value_type>());
+        return boost::algorithm::is_sorted (first, last, std::greater_equal<value_type>());
     }
 
 /// \fn is_decreasing ( const R &range )
@@ -228,7 +238,7 @@ namespace boost { namespace algorithm {
     bool is_strictly_increasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return boost::algorithm::is_sorted (first, last, std::less_equal<value_type>());
+        return boost::algorithm::is_sorted (first, last, std::less<value_type>());
     }
 
 /// \fn is_strictly_increasing ( const R &range )
@@ -259,7 +269,7 @@ namespace boost { namespace algorithm {
     bool is_strictly_decreasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return boost::algorithm::is_sorted (first, last, std::greater_equal<value_type>());
+        return boost::algorithm::is_sorted (first, last, std::greater<value_type>());
     }
 
 /// \fn is_strictly_decreasing ( const R &range )

include/boost/algorithm/cxx11/none_of.hpp

@@ -12,12 +12,15 @@
 #ifndef BOOST_ALGORITHM_NONE_OF_HPP
 #define BOOST_ALGORITHM_NONE_OF_HPP
 
-#include <algorithm>    // for std::none_of, if available
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+//  Use the C++11 versions of the none_of if it is available
+#if __cplusplus >= 201103L
+using std::none_of;     // Section 25.2.3
+#else
 /// \fn none_of ( InputIterator first, InputIterator last, Predicate p )
 /// \return true if none of the elements in [first, last) satisfy the predicate 'p'
 /// \note returns true on an empty range
@@ -34,6 +37,7 @@ for ( ; first != last; ++first )
         return false;
     return true;
 } 
+#endif
 
 /// \fn none_of ( const Range &r, Predicate p )
 /// \return true if none of the elements in the range satisfy the predicate 'p'

include/boost/algorithm/cxx11/partition_copy.hpp

@@ -12,7 +12,6 @@
 #ifndef BOOST_ALGORITHM_PARTITION_COPY_HPP
 #define BOOST_ALGORITHM_PARTITION_COPY_HPP
 
-#include <algorithm>    // for std::partition_copy, if available
 #include <utility>  // for make_pair
 
 #include <boost/range/begin.hpp>
@@ -20,6 +19,10 @@
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of partition_copy if it is available
+using std::partition_copy;  // Section 25.3.13
+#else
 /// \fn partition_copy ( InputIterator first, InputIterator last,
 ///     OutputIterator1 out_true, OutputIterator2 out_false, UnaryPredicate p )
 /// \brief Copies the elements that satisfy the predicate p from the range [first, last) 
@@ -49,6 +52,7 @@ partition_copy ( InputIterator first, InputIterator last,
             *out_false++ = *first;
     return std::pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
 }
+#endif
 
 /// \fn partition_copy ( const Range &r, 
 ///     OutputIterator1 out_true, OutputIterator2 out_false, UnaryPredicate p )

include/boost/algorithm/cxx11/partition_point.hpp

@@ -12,16 +12,20 @@
 #ifndef BOOST_ALGORITHM_PARTITION_POINT_HPP
 #define BOOST_ALGORITHM_PARTITION_POINT_HPP
 
-#include <algorithm>    // for std::partition_point, if available
+#include <algorithm>	// for std::partition_point, if available
 
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
 namespace boost { namespace algorithm {
 
+#if __cplusplus >= 201103L
+//  Use the C++11 versions of iota if it is available
+using std::partition_point;      // Section 25.3.13
+#else
 /// \fn partition_point ( ForwardIterator first, ForwardIterator last, Predicate p )
 /// \brief Given a partitioned range, returns the partition point, i.e, the first element 
-///     that does not satisfy p
+///		that does not satisfy p
 /// 
 /// \param first    The start of the input sequence
 /// \param last     One past the end of the input sequence
@@ -48,6 +52,7 @@ ForwardIterator partition_point ( ForwardIterator first, ForwardIterator last, P
         }
     return first;
 }
+#endif
 
 /// \fn partition_point ( Range &r, Predicate p )
 /// \brief Given a partitioned range, returns the partition point
@@ -56,7 +61,7 @@ ForwardIterator partition_point ( ForwardIterator first, ForwardIterator last, P
 /// \param p        The predicate to test the values with
 ///
 template <typename Range, typename Predicate>
-typename boost::range_iterator<Range>::type partition_point ( Range &r, Predicate p )
+typename boost::range_iterator<Range> partition_point ( Range &r, Predicate p )
 {
     return boost::algorithm::partition_point (boost::begin(r), boost::end(r), p);
 }
@@ -64,4 +69,4 @@ typename boost::range_iterator<Range>::type partition_point ( Range &r, Predicat
 
 }}
 
-#endif  // BOOST_ALGORITHM_PARTITION_POINT_HPP
+#endif  // BOOST_ALGORITHM_PARTITION_POINT_HPP

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/is_permutation.hpp

@@ -1,84 +0,0 @@
-/*
-   Copyright (c) Marshall Clow 2014.
-
-   Distributed under the Boost Software License, Version 1.0. (See accompanying
-   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/// \file  is_permutation.hpp
-/// \brief Is a sequence a permutation of another sequence (four iterator versions)
-/// \author Marshall Clow
-
-#ifndef BOOST_ALGORITHM_IS_PERMUTATION14_HPP
-#define BOOST_ALGORITHM_IS_PERMUTATION14_HPP
-
-#include <algorithm>    // for std::less, tie, mismatch and is_permutation (if available)
-#include <utility>      // for std::make_pair
-#include <functional>   // for std::equal_to
-#include <iterator>
-
-#include <boost/algorithm/cxx11/is_permutation.hpp>
-#include <boost/algorithm/cxx14/mismatch.hpp>
-
-namespace boost { namespace algorithm {
-
-/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, 
-///                      ForwardIterator2 first2, ForwardIterator2 last2 )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
-///
-/// \param first1   The start of the input sequence
-/// \param last2    One past the end of the input sequence
-/// \param first2   The start of the second sequence
-/// \param last1    One past the end of the second sequence
-/// \note           This function is part of the C++2014 standard library.
-///  We will use the standard one if it is available,
-///     otherwise we have our own implementation.
-template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, 
-                      ForwardIterator2 first2, ForwardIterator2 last2 )
-{
-//  How should I deal with the idea that ForwardIterator1::value_type
-//  and ForwardIterator2::value_type could be different? Define my own comparison predicate?
-    std::pair<ForwardIterator1, ForwardIterator2> eq = boost::algorithm::mismatch
-        ( first1, last1, first2, last2 );
-    if ( eq.first == last1 && eq.second == last2)
-        return true;
-    return boost::algorithm::detail::is_permutation_tag (
-        eq.first, last1, eq.second, last2, 
-        std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> (),
-        typename std::iterator_traits<ForwardIterator1>::iterator_category (),
-        typename std::iterator_traits<ForwardIterator2>::iterator_category ());
-}
-
-/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, 
-///                      ForwardIterator2 first2, ForwardIterator2 last2, 
-///                      BinaryPredicate p )
-/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
-///
-/// \param first1   The start of the input sequence
-/// \param last1    One past the end of the input sequence
-/// \param first2   The start of the second sequence
-/// \param last2    One past the end of the second sequence
-/// \param pred     The predicate to compare elements with
-///
-/// \note           This function is part of the C++2014 standard library.
-///  We will use the standard one if it is available,
-///     otherwise we have our own implementation.
-template< class ForwardIterator1, class ForwardIterator2, class BinaryPredicate >
-bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
-                      ForwardIterator2 first2, ForwardIterator2 last2, 
-                      BinaryPredicate pred )
-{
-    std::pair<ForwardIterator1, ForwardIterator2> eq = boost::algorithm::mismatch
-        ( first1, last1, first2, last2, pred );
-    if ( eq.first == last1 && eq.second == last2)
-        return true;
-    return boost::algorithm::detail::is_permutation_tag (
-        first1, last1, first2, last2, pred, 
-        typename std::iterator_traits<ForwardIterator1>::iterator_category (),
-        typename std::iterator_traits<ForwardIterator2>::iterator_category ());
-}
-
-}}
-
-#endif  // BOOST_ALGORITHM_IS_PERMUTATION14_HPP

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,19 +42,23 @@ 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
-*/ /*!    
+    			Contains the offending character
+    
     \struct not_enough_input 
     \brief  Thrown when the input sequence unexpectedly ends
     
 */
-struct hex_decode_error : virtual boost::exception, virtual std::exception {};
-struct not_enough_input : virtual hex_decode_error {};
-struct non_hex_input    : virtual hex_decode_error {};
-typedef boost::error_info<struct bad_char_,char> bad_char;
+struct hex_decode_error: virtual boost::exception, virtual std::exception {};
+struct not_enough_input : public hex_decode_error {};
+struct non_hex_input : public hex_decode_error {
+    non_hex_input ( char ch ) : bad_char ( ch ) {}
+    char bad_char;
+private:
+    non_hex_input ();       // don't allow creation w/o a char
+    };
 
 namespace detail {
 /// \cond DOXYGEN_HIDE
@@ -63,16 +73,14 @@ 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;
+    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 (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
@@ -101,32 +109,40 @@ namespace detail {
 //  The first one is the output type, the second one is the character type of
 //  the underlying stream, the third is the character traits.
 //      We only care about the first one.
-    template<typename T, typename charType, typename traits>
-    struct hex_iterator_traits< std::ostream_iterator<T, charType, traits> > {
-        typedef T value_type;
-    };
+  template<typename T, typename charType, typename traits>
+  struct hex_iterator_traits< std::ostream_iterator<T, charType, traits> > {
+      typedef T value_type;
+  };
 
+//  Output Iterators have a value type of 'void'. Kinda sucks. 
+//  We special case some output iterators, but we can't enumerate them all.
+//  If we can't figure it out, we assume that you want to output chars.
+//  If you don't, pass in an iterator with a real value_type.
+    template <typename T> struct value_type_or_char       { typedef T value_type; };
+    template <>           struct value_type_or_char<void> { typedef char value_type; };
+    
+//  All in one step
     template <typename Iterator> 
-    bool iter_end ( Iterator current, Iterator last ) { return current == last; }
-  
-    template <typename T>
-    bool ptr_end ( const T* ptr, const T* /*end*/ ) { return *ptr == '\0'; }
-  
+    struct iterator_value_type {
+//        typedef typename value_type_or_char<typename hex_iterator_traits<Iterator>::value_type>::value_type value_type;
+        typedef typename hex_iterator_traits<Iterator>::value_type value_type;
+        };
+        
 //  What can we assume here about the inputs?
 //      is std::iterator_traits<InputIterator>::value_type always 'char' ?
 //  Could it be wchar_t, say? Does it matter?
 //      We are assuming ASCII for the values - but what about the storage?
-    template <typename InputIterator, typename OutputIterator, typename EndPred>
-    typename boost::enable_if<boost::is_integral<typename hex_iterator_traits<OutputIterator>::value_type>, OutputIterator>::type
-    decode_one ( InputIterator &first, InputIterator last, OutputIterator out, EndPred pred ) {
-        typedef typename hex_iterator_traits<OutputIterator>::value_type T;
+    template <typename InputIterator, typename OutputIterator>
+    typename boost::enable_if<boost::is_integral<typename iterator_value_type<OutputIterator>::value_type>, OutputIterator>::type
+    decode_one ( InputIterator &first, InputIterator last, OutputIterator out ) {
+        typedef typename iterator_value_type<OutputIterator>::value_type T;
         T res (0);
 
     //  Need to make sure that we get can read that many chars here.
         for ( std::size_t i = 0; i < 2 * sizeof ( T ); ++i, ++first ) {
-            if ( pred ( first, last )) 
+            if ( 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;
@@ -193,7 +209,7 @@ hex ( const Range &r, OutputIterator out ) {
 template <typename InputIterator, typename OutputIterator>
 OutputIterator unhex ( InputIterator first, InputIterator last, OutputIterator out ) {
     while ( first != last )
-        out = detail::decode_one ( first, last, out, detail::iter_end<InputIterator> );
+        out = detail::decode_one ( first, last, out );
     return out;
     }
 
@@ -207,11 +223,14 @@ OutputIterator unhex ( InputIterator first, InputIterator last, OutputIterator o
 /// \note           Based on the MySQL function of the same name
 template <typename T, typename OutputIterator>
 OutputIterator unhex ( const T *ptr, OutputIterator out ) {
+    typedef typename detail::iterator_value_type<OutputIterator>::value_type OutputType;
 //  If we run into the terminator while decoding, we will throw a
 //      malformed input exception. It would be nicer to throw a 'Not enough input'
 //      exception - but how much extra work would that require?
+//  I just make up an "end iterator" which we will never get to - 
+//      two Ts per byte of the output type.
     while ( *ptr )
-        out = detail::decode_one ( ptr, (const T *) NULL, out, detail::ptr_end<T> );
+        out = detail::decode_one ( ptr, ptr + 2 * sizeof(OutputType), out );
     return out;
     }
 

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
 
@@ -223,7 +223,7 @@ Requirements:
     corpusIter boyer_moore_search ( 
         corpusIter corpus_first, corpusIter corpus_last, const PatternRange &pattern )
     {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
+        typedef typename boost::range_iterator<PatternRange> pattern_iterator;
         boyer_moore<pattern_iterator> bm ( boost::begin(pattern), boost::end (pattern));
         return bm ( corpus_first, corpus_last );
     }
@@ -242,7 +242,7 @@ Requirements:
     typename boost::range_iterator<CorpusRange>::type
     boyer_moore_search ( CorpusRange &corpus, const PatternRange &pattern )
     {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
+        typedef typename boost::range_iterator<PatternRange> pattern_iterator;
         boyer_moore<pattern_iterator> bm ( boost::begin(pattern), boost::end (pattern));
         return bm (boost::begin (corpus), boost::end (corpus));
     }

include/boost/algorithm/searching/boyer_moore_horspool.hpp

@@ -14,11 +14,6 @@
 
 #include <boost/assert.hpp>
 #include <boost/static_assert.hpp>
-
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-
-#include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/algorithm/searching/detail/bm_traits.hpp>
@@ -89,11 +84,6 @@ http://www-igm.univ-mlv.fr/%7Elecroq/string/node18.html
             return this->do_search ( corpus_first, corpus_last );
             }
             
-        template <typename Range>
-        typename boost::range_iterator<Range>::type operator () ( Range &r ) const {
-            return (*this) (boost::begin(r), boost::end(r));
-            }
-
     private:
 /// \cond DOXYGEN_HIDE
         patIter pat_first, pat_last;
@@ -129,9 +119,6 @@ http://www-igm.univ-mlv.fr/%7Elecroq/string/node18.html
 // \endcond
         };
 
-/*  Two ranges as inputs gives us four possibilities; with 2,3,3,4 parameters
-    Use a bit of TMP to disambiguate the 3-argument templates */
-
 /// \fn boyer_moore_horspool_search ( corpusIter corpus_first, corpusIter corpus_last, 
 ///       patIter pat_first, patIter pat_last )
 /// \brief Searches the corpus for the pattern.
@@ -143,55 +130,10 @@ http://www-igm.univ-mlv.fr/%7Elecroq/string/node18.html
 ///
     template <typename patIter, typename corpusIter>
     corpusIter boyer_moore_horspool_search ( 
-                  corpusIter corpus_first, corpusIter corpus_last, 
-                  patIter pat_first, patIter pat_last )
-    {
+            corpusIter corpus_first, corpusIter corpus_last, 
+            patIter pat_first, patIter pat_last ) {
         boyer_moore_horspool<patIter> bmh ( pat_first, pat_last );
         return bmh ( corpus_first, corpus_last );
-    }
-
-    template <typename PatternRange, typename corpusIter>
-    corpusIter boyer_moore_horspool_search ( 
-        corpusIter corpus_first, corpusIter corpus_last, const PatternRange &pattern )
-    {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
-        boyer_moore_horspool<pattern_iterator> bmh ( boost::begin(pattern), boost::end (pattern));
-        return bmh ( corpus_first, corpus_last );
-    }
-    
-    template <typename patIter, typename CorpusRange>
-    typename boost::lazy_disable_if_c<
-        boost::is_same<CorpusRange, patIter>::value, typename boost::range_iterator<CorpusRange> >
-    ::type
-    boyer_moore_horspool_search ( CorpusRange &corpus, patIter pat_first, patIter pat_last )
-    {
-        boyer_moore_horspool<patIter> bmh ( pat_first, pat_last );
-        return bm (boost::begin (corpus), boost::end (corpus));
-    }
-    
-    template <typename PatternRange, typename CorpusRange>
-    typename boost::range_iterator<CorpusRange>::type
-    boyer_moore_horspool_search ( CorpusRange &corpus, const PatternRange &pattern )
-    {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
-        boyer_moore_horspool<pattern_iterator> bmh ( boost::begin(pattern), boost::end (pattern));
-        return bmh (boost::begin (corpus), boost::end (corpus));
-    }
-
-
-    //  Creator functions -- take a pattern range, return an object
-    template <typename Range>
-    boost::algorithm::boyer_moore_horspool<typename boost::range_iterator<const Range>::type>
-    make_boyer_moore_horspool ( const Range &r ) {
-        return boost::algorithm::boyer_moore_horspool
-            <typename boost::range_iterator<const Range>::type> (boost::begin(r), boost::end(r));
-        }
-    
-    template <typename Range>
-    boost::algorithm::boyer_moore_horspool<typename boost::range_iterator<Range>::type>
-    make_boyer_moore_horspool ( Range &r ) {
-        return boost::algorithm::boyer_moore_horspool
-            <typename boost::range_iterator<Range>::type> (boost::begin(r), boost::end(r));
         }
 
 }}

include/boost/algorithm/searching/detail/bm_traits.hpp

@@ -20,11 +20,7 @@
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/array.hpp>
-#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#include <boost/unordered_map.hpp>
-#else
-#include <unordered_map>
-#endif
+#include <boost/tr1/tr1/unordered_map>
 
 #include <boost/algorithm/searching/detail/debugging.hpp>
 
@@ -39,11 +35,7 @@ namespace boost { namespace algorithm { namespace detail {
     template<typename key_type, typename value_type>
     class skip_table<key_type, value_type, false> {
     private:
-#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
-        typedef boost::unordered_map<key_type, value_type> skip_map;
-#else
-        typedef std::unordered_map<key_type, value_type> skip_map;
-#endif
+        typedef std::tr1::unordered_map<key_type, value_type> skip_map;
         const value_type k_default_value;
         skip_map skip_;
         

include/boost/algorithm/searching/knuth_morris_pratt.hpp

@@ -15,11 +15,6 @@
 
 #include <boost/assert.hpp>
 #include <boost/static_assert.hpp>
-
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-
-#include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/algorithm/searching/detail/debugging.hpp>
@@ -37,7 +32,7 @@ namespace boost { namespace algorithm {
         * Random-access iterators
         * The two iterator types (I1 and I2) must "point to" the same underlying type.
 
-    http://en.wikipedia.org/wiki/Knuth-Morris-Pratt_algorithm
+    http://en.wikipedia.org/wiki/Knuth–Morris–Pratt_algorithm
     http://www.inf.fh-flensburg.de/lang/algorithmen/pattern/kmpen.htm
 */
 
@@ -84,11 +79,6 @@ namespace boost { namespace algorithm {
             return do_search   ( corpus_first, corpus_last, k_corpus_length );
             }
     
-        template <typename Range>
-        typename boost::range_iterator<Range>::type operator () ( Range &r ) const {
-            return (*this) (boost::begin(r), boost::end(r));
-            }
-
     private:
 /// \cond DOXYGEN_HIDE
         patIter pat_first, pat_last;
@@ -189,9 +179,6 @@ namespace boost { namespace algorithm {
         };
 
 
-/*  Two ranges as inputs gives us four possibilities; with 2,3,3,4 parameters
-    Use a bit of TMP to disambiguate the 3-argument templates */
-
 /// \fn knuth_morris_pratt_search ( corpusIter corpus_first, corpusIter corpus_last, 
 ///       patIter pat_first, patIter pat_last )
 /// \brief Searches the corpus for the pattern.
@@ -203,55 +190,10 @@ namespace boost { namespace algorithm {
 ///
     template <typename patIter, typename corpusIter>
     corpusIter knuth_morris_pratt_search ( 
-                  corpusIter corpus_first, corpusIter corpus_last, 
-                  patIter pat_first, patIter pat_last )
-    {
+            corpusIter corpus_first, corpusIter corpus_last, 
+            patIter pat_first, patIter pat_last ) {
         knuth_morris_pratt<patIter> kmp ( pat_first, pat_last );
         return kmp ( corpus_first, corpus_last );
-    }
-
-    template <typename PatternRange, typename corpusIter>
-    corpusIter knuth_morris_pratt_search ( 
-        corpusIter corpus_first, corpusIter corpus_last, const PatternRange &pattern )
-    {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
-        knuth_morris_pratt<pattern_iterator> kmp ( boost::begin(pattern), boost::end (pattern));
-        return kmp ( corpus_first, corpus_last );
-    }
-    
-    template <typename patIter, typename CorpusRange>
-    typename boost::lazy_disable_if_c<
-        boost::is_same<CorpusRange, patIter>::value, typename boost::range_iterator<CorpusRange> >
-    ::type
-    knuth_morris_pratt_search ( CorpusRange &corpus, patIter pat_first, patIter pat_last )
-    {
-        knuth_morris_pratt<patIter> kmp ( pat_first, pat_last );
-        return kmp (boost::begin (corpus), boost::end (corpus));
-    }
-    
-    template <typename PatternRange, typename CorpusRange>
-    typename boost::range_iterator<CorpusRange>::type
-    knuth_morris_pratt_search ( CorpusRange &corpus, const PatternRange &pattern )
-    {
-        typedef typename boost::range_iterator<const PatternRange>::type pattern_iterator;
-        knuth_morris_pratt<pattern_iterator> kmp ( boost::begin(pattern), boost::end (pattern));
-        return kmp (boost::begin (corpus), boost::end (corpus));
-    }
-
-
-    //  Creator functions -- take a pattern range, return an object
-    template <typename Range>
-    boost::algorithm::knuth_morris_pratt<typename boost::range_iterator<const Range>::type>
-    make_knuth_morris_pratt ( const Range &r ) {
-        return boost::algorithm::knuth_morris_pratt
-            <typename boost::range_iterator<const Range>::type> (boost::begin(r), boost::end(r));
-        }
-    
-    template <typename Range>
-    boost::algorithm::knuth_morris_pratt<typename boost::range_iterator<Range>::type>
-    make_knuth_morris_pratt ( Range &r ) {
-        return boost::algorithm::knuth_morris_pratt
-            <typename boost::range_iterator<Range>::type> (boost::begin(r), boost::end(r));
         }
 }}
 

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 ) )
@@ -622,6 +627,8 @@ namespace boost {
                 {
 #if BOOST_WORKAROUND( __MWERKS__, <= 0x3003 ) 
                     return iterator_range<const ForwardIterator2T>(this->m_Range);
+#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+                    return iterator_range<ForwardIterator2T>(m_Range.begin(), m_Range.end());
 #else
                     return m_Range;
 #endif

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>
@@ -230,12 +230,7 @@ namespace boost {
     
                 \post eof()==true
             */
-            split_iterator() :
-                m_Next(),
-                m_End(),
-                m_bEof(true)
-            {}
-
+            split_iterator() {}
             //! Copy constructor
             /*!
                 Construct a copy of the split_iterator

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>
@@ -60,7 +60,7 @@ namespace boost {
                 a match).
             \param Input A container which will be searched.
             \param Finder A Finder object used for searching
-            \return A reference to the result
+            \return A reference the result
 
             \note Prior content of the result will be overwritten.
         */
@@ -122,7 +122,7 @@ namespace boost {
             Each match is used as a separator of segments. These segments are then
             returned in the result.
 
-            \param Result A 'container container' to contain the result of search.
+            \param Result A 'container container' to container the result of search.
                 Both outer and inner container must have constructor taking a pair
                 of iterators as an argument.
                 Typical type of the result is 
@@ -131,7 +131,7 @@ namespace boost {
                 a match).
             \param Input A container which will be searched.
             \param Finder A finder object used for searching
-            \return A reference to the result
+            \return A reference the result
 
             \note Prior content of the result will be overwritten.
         */

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/sequence_traits.hpp

@@ -36,6 +36,47 @@ namespace boost {
 
 //  sequence traits  -----------------------------------------------//
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        //! Native replace tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the container has basic_string like native replace
+            method.
+        */
+        no_type has_native_replace_tester(...);
+
+        //! Stable iterators tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's insert/replace/erase methods do not invalidate
+            existing iterators.
+        */
+        no_type has_stable_iterators_tester(...);
+
+        //! const time insert tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's insert method is working in constant time
+        */
+        no_type has_const_time_insert_tester(...);
+
+        //! const time erase tester
+        /*!
+            Declare an override of this tester function with return
+            type boost::string_algo::yes_type for a sequence with this property.
+
+            \return yes_type if the sequence's erase method is working in constant time
+        */
+        no_type has_const_time_erase_tester(...);
+
+#endif //BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
         //! Native replace trait
         /*!
@@ -45,12 +86,20 @@ namespace boost {
         class has_native_replace
         {
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_native_replace_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             enum { value = false };
 #    else
             BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
 
             typedef mpl::bool_<has_native_replace<T>::value> type;
@@ -65,12 +114,20 @@ namespace boost {
         template< typename T >
         class has_stable_iterators
         {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_stable_iterators_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             enum { value = false };
 #    else
             BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
             typedef mpl::bool_<has_stable_iterators<T>::value> type;
         };
@@ -84,12 +141,20 @@ namespace boost {
         template< typename T >
         class has_const_time_insert
         {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_const_time_insert_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             enum { value = false };
 #    else
             BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
             typedef mpl::bool_<has_const_time_insert<T>::value> type;
         };
@@ -103,12 +168,20 @@ namespace boost {
         template< typename T >
         class has_const_time_erase
         {
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+        private:
+            static T* t;
+        public:
+            BOOST_STATIC_CONSTANT(bool, value=(
+                sizeof(has_const_time_erase_tester(t))==sizeof(yes_type) ) );
+#else  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         public:
 #    if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             enum { value = false };
 #    else
             BOOST_STATIC_CONSTANT(bool, value=false);
 #    endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
             typedef mpl::bool_<has_const_time_erase<T>::value> type;
         };

include/boost/algorithm/string/std/list_traits.hpp

@@ -20,6 +20,22 @@ namespace boost {
 
 //  std::list<> traits  -----------------------------------------------//
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // stable iterators tester
+        template<typename T, typename AllocT>
+        yes_type has_stable_iterators_tester( const ::std::list<T,AllocT>* );
+
+        // const time insert tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_insert_tester( const ::std::list<T,AllocT>* );
+
+        // const time erase tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_erase_tester( const ::std::list<T,AllocT>* );
+
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
         // stable iterators trait
         template<typename T, typename AllocT>
@@ -59,6 +75,7 @@ namespace boost {
 #endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             typedef mpl::bool_<has_const_time_erase<T>::value> type;
         };
+#endif
 
 
     } // namespace algorithm

include/boost/algorithm/string/std/rope_traits.hpp

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

include/boost/algorithm/string/std/slist_traits.hpp

@@ -21,6 +21,21 @@ namespace boost {
 
 //  SGI's std::slist<> traits  -----------------------------------------------//
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // stable iterators tester
+        template<typename T, typename AllocT>
+        yes_type has_stable_iterators_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+        // const time insert tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_insert_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+        // const time erase tester
+        template<typename T, typename AllocT>
+        yes_type has_const_time_erase_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
     // stable iterators trait
         template<typename T, typename AllocT>
@@ -60,6 +75,7 @@ namespace boost {
 #endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
             typedef mpl::bool_<has_const_time_erase<T>::value> type;
         };
+#endif
 
 
     } // namespace algorithm

include/boost/algorithm/string/std/string_traits.hpp

@@ -20,6 +20,13 @@ namespace boost {
 
 //  std::basic_string<> traits  -----------------------------------------------//
 
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+        // native replace tester
+        template<typename T, typename TraitsT, typename AllocT>
+        yes_type has_native_replace_tester( const std::basic_string<T, TraitsT, AllocT>* );
+
+#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
     // native replace trait
         template<typename T, typename TraitsT, typename AllocT>
@@ -36,6 +43,7 @@ namespace boost {
         };
 
 
+#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
     } // namespace algorithm
 } // namespace boost

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>

index.html

@@ -1,13 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=doc/html/index.html">
-</head>
-<body>
-Automatic redirection failed, please go to
-<a href="doc/html/index.html">doc/html/index.html</a> &nbsp;<hr>
-<p>© Copyright Marshall Clow, 2012</p>
-<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
-file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
-at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
-</body>
-</html>

meta/libraries.json

@@ -1,47 +0,0 @@
-[
-    {
-        "key": "algorithm",
-        "name": "Algorithm",
-        "authors": [
-            "Marshall Clow"
-        ],
-        "description": "A collection of useful generic algorithms.",
-        "category": [
-            "Algorithms"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    },
-    {
-        "key": "algorithm/minmax",
-        "name": "Min-Max",
-        "authors": [
-            "Hervé Brönnimann"
-        ],
-        "description": "Standard library extensions for simultaneous min/max and min/max element computations.",
-        "documentation": "minmax/",
-        "category": [
-            "Algorithms"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    },
-    {
-        "key": "algorithm/string",
-        "name": "String Algo",
-        "authors": [
-            "Pavol Droba"
-        ],
-        "description": "String algorithms library.",
-        "documentation": "string/",
-        "category": [
-            "Algorithms",
-            "String"
-        ],
-        "maintainers": [
-            "Marshall Clow <marshall -at- idio.com>"
-        ]
-    }
-]

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/doc/usage.xml

@@ -130,17 +130,17 @@
     string str1("command.com");
     cout 
         << str1
-        << (is_executable(str1)? "is": "is not") 
+        << (is_executable("command.com")? "is": "is not") 
         << "an executable" 
         << endl; // prints "command.com is an executable"
     
     //..
-    char text1[]="hello";
+    char text1[]="hello world!";
     cout 
         << text1 
-        << (all( text1, is_lower() )? " is": " is not")
+        << (all( text1, is_lower() )? "is": "is not")
         << " written in the lower case" 
-        << endl; // prints "hello is written in the lower case"
+        << endl; // prints "hello world! is written in the lower case"
         </programlisting>
         <para>
             The predicates determine whether if a substring is contained in the input string
@@ -149,11 +149,6 @@
             simply contains the substring or if both strings are equal. See the reference for 
             <headername>boost/algorithm/string/predicate.hpp</headername> for more details. 
         </para>
-        <para>  
-            Note that if we had used "hello world" as the input to the test, it would have
-            output "hello world is not written in the lower case" because the space in the
-            input string is not a lower case letter.
-        </para>
         <para>  
             In addition the algorithm <functionname>all()</functionname> checks
             all elements of a container to satisfy a condition specified by a predicate. 

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( 
@@ -181,21 +179,6 @@ void find_test()
         ( (cv_result.begin()-str1.begin()) == 3) &&
         ( (cv_result.end()-str1.begin()) == 6) );
 
-    string s1("abc def ghi jkl");
-    find_iterator<string::iterator> fEnd;
-
-    find_iterator<string::iterator> fxIt = make_find_iterator(s1,
-            token_finder(is_alnum(), token_compress_on));
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
-    ++fxIt;
-    BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
-    ++fxIt;
-    BOOST_CHECK(fxIt == fEnd);
-
     nc_result=find_token( str1, is_any_of("abc"), token_compress_off );
     BOOST_CHECK( 
         ( (nc_result.begin()-str1.begin()) == 3) &&
@@ -210,7 +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( 
@@ -223,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( 
@@ -236,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() );
@@ -249,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() );
@@ -265,11 +248,12 @@ void find_test()
     ostringstream osstr;
     osstr << find_first( str1, "abc" );
     BOOST_CHECK( osstr.str()=="abc" );
-
 }
 
 // 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,61 +9,41 @@
 
 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 ]
+     [ compile-fail search_fail1.cpp : : : : ]
+     [ compile-fail search_fail2.cpp : : : : ]
+     [ compile-fail search_fail3.cpp : : : : ]
 
-# Misc tests
-     [ run clamp_test.cpp unit_test_framework         : : : : clamp_test ]
-     [ run power_test.cpp unit_test_framework         : : : : power_test ]
-     [ compile-fail power_fail1.cpp  : : : : ]
+# Clamp tests
+     [ run clamp_test.cpp        : : : : clamp_test ]
    
 # Cxx11 tests
-     [ run all_of_test.cpp unit_test_framework         : : : : all_of_test ]
-     [ run any_of_test.cpp unit_test_framework         : : : : any_of_test ]
-     [ run none_of_test.cpp unit_test_framework        : : : : none_of_test ]
-     [ run one_of_test.cpp unit_test_framework         : : : : one_of_test ]
+     [ run all_of_test.cpp        : : : : all_of_test ]
+     [ run any_of_test.cpp        : : : : any_of_test ]
+     [ run none_of_test.cpp       : : : : none_of_test ]
+     [ run one_of_test.cpp        : : : : one_of_test ]
      
-     [ run ordered_test.cpp unit_test_framework        : : : : ordered_test ]
-     [ run find_if_not_test1.cpp unit_test_framework   : : : : find_if_not_test1 ]
-     [ run copy_if_test1.cpp unit_test_framework        : : : : copy_if_test1 ]
-     [ run copy_n_test1.cpp unit_test_framework       : : : : copy_n_test1 ]
-     [ run iota_test1.cpp unit_test_framework          : : : : iota_test1 ]
+     [ run ordered_test.cpp       : : : : ordered_test ]
+     [ run find_if_not_test1.cpp  : : : : find_if_not_test1 ]
+     [ run copy_n_test1.cpp       : : : : copy_n_test1 ]
+     [ run iota_test1.cpp         : : : : iota_test1 ]
 
-     [ run is_permutation_test1.cpp unit_test_framework         : : : : is_permutation_test1 ]
-     [ run partition_point_test1.cpp unit_test_framework        : : : : partition_point_test1 ]
-     [ run is_partitioned_test1.cpp unit_test_framework         : : : : is_partitioned_test1 ]
-     [ run partition_copy_test1.cpp unit_test_framework         : : : : partition_copy_test1 ]
-
-# Cxx14 tests
-     [ run equal_test.cpp unit_test_framework         : : : : equal_test ]
-     [ run mismatch_test.cpp unit_test_framework      : : : : mismatch_test ]
+     [ run is_permutation_test1.cpp        : : : : is_permutation_test1 ]
+     [ run partition_point_test1.cpp       : : : : partition_point_test1 ]
+     [ run is_partitioned_test1.cpp        : : : : is_partitioned_test1 ]
+     [ run partition_copy_test1.cpp        : : : : partition_copy_test1 ]
 
 # Hex tests
-     [ run hex_test1.cpp unit_test_framework         : : : : hex_test1 ]
-     [ run hex_test2.cpp unit_test_framework         : : : : hex_test2 ]
-     [ run hex_test3.cpp unit_test_framework         : : : : hex_test3 ]
-     [ run hex_test4.cpp unit_test_framework         : : : : hex_test4 ]
-     [ compile-fail hex_fail1.cpp ]
-
-# Gather tests
-     [ run gather_test1.cpp unit_test_framework        : : : : gather_test1 ]
-     [ compile-fail gather_fail1.cpp ]
-
+     [ run hex_test1.cpp        : : : : hex_test1 ]
+     [ run hex_test2.cpp        : : : : hex_test2 ]
+     [ run hex_test3.cpp        : : : : hex_test3 ]
+	 [ 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

@@ -1,179 +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/cxx11/copy_if.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <string>
-#include <iostream>
-#include <vector>
-#include <list>
-
-#include <boost/algorithm/cxx11/all_of.hpp>
-#include <boost/algorithm/cxx11/none_of.hpp>
-
-namespace ba = boost::algorithm;
-// namespace ba = boost;
-
-bool is_true  ( int v ) { return true; }
-bool is_false ( int v ) { return false; }
-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 ) {
-
-    typedef typename Container::value_type value_type;
-    std::vector<value_type> v;
-    
-//  None of the elements
-    v.clear ();
-    ba::copy_if ( c.begin (), c.end (), back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == 0 );
-
-    v.clear ();
-    ba::copy_if ( c, back_inserter ( v ), is_false);
-    BOOST_CHECK ( v.size () == 0 );
-
-//  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 ()));
-
-    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 ()));
-
-//  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 ( 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 ( 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 );
-    
-    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 );
-    }
-
-
-BOOST_AUTO_TEST_CASE( test_main )
-{
-  test_sequence1 ();
-}

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>
@@ -24,63 +22,64 @@ namespace ba = boost::algorithm;
 template <typename Container>
 void test_sequence ( Container const &c ) {
 
-    typedef typename Container::value_type value_type;
-    std::vector<value_type> v;
-    
-//  Copy zero elements
-    v.clear ();
-    ba::copy_n ( c.begin (), 0, back_inserter ( v ));
-    BOOST_CHECK ( v.size () == 0 );
-    ba::copy_n ( c.begin (), 0U, back_inserter ( v ));
-    BOOST_CHECK ( v.size () == 0 );
+	typedef typename Container::value_type value_type;
+	std::vector<value_type> v;
+	
+//	Copy zero elements
+	v.clear ();
+	ba::copy_n ( c.begin (), 0, back_inserter ( v ));
+	BOOST_CHECK ( v.size () == 0 );
+	ba::copy_n ( c.begin (), 0U, back_inserter ( v ));
+	BOOST_CHECK ( v.size () == 0 );
 
-    if ( c.size () > 0 ) {  
-    //  Just one element
-        v.clear ();
-        ba::copy_n ( c.begin (), 1, back_inserter ( v ));
-        BOOST_CHECK ( v.size () == 1 );
-        BOOST_CHECK ( v[0] == *c.begin ());
-        
-        v.clear ();
-        ba::copy_n ( c.begin (), 1U, back_inserter ( v ));
-        BOOST_CHECK ( v.size () == 1 );
-        BOOST_CHECK ( v[0] == *c.begin ());
+	if ( c.size () > 0 ) {	
+	//	Just one element
+		v.clear ();
+		ba::copy_n ( c.begin (), 1, back_inserter ( v ));
+		BOOST_CHECK ( v.size () == 1 );
+		BOOST_CHECK ( v[0] == *c.begin ());
+		
+		v.clear ();
+		ba::copy_n ( c.begin (), 1U, back_inserter ( v ));
+		BOOST_CHECK ( v.size () == 1 );
+		BOOST_CHECK ( v[0] == *c.begin ());
 
-    //  Half the elements
-        v.clear ();
-        ba::copy_n ( c.begin (), c.size () / 2, back_inserter ( v ));
-        BOOST_CHECK ( v.size () == c.size () / 2);
-        BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
+	//	Half the elements
+		v.clear ();
+		ba::copy_n ( c.begin (), c.size () / 2, back_inserter ( v ));
+		BOOST_CHECK ( v.size () == c.size () / 2);
+		BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
 
-    //  Half the elements + 1
-        v.clear ();
-        ba::copy_n ( c.begin (), c.size () / 2 + 1, back_inserter ( v ));
-        BOOST_CHECK ( v.size () == c.size () / 2 + 1 );
-        BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-    
-    //  All the elements
-        v.clear ();
-        ba::copy_n ( c.begin (), c.size (), back_inserter ( v ));
-        BOOST_CHECK ( v.size () == c.size ());
-        BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
-        }
-    }
+	//	Half the elements + 1
+		v.clear ();
+		ba::copy_n ( c.begin (), c.size () / 2 + 1, back_inserter ( v ));
+		BOOST_CHECK ( v.size () == c.size () / 2 + 1 );
+		BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ()));
+	
+	//	All the elements
+		v.clear ();
+		ba::copy_n ( c.begin (), c.size (), back_inserter ( v ));
+		BOOST_CHECK ( v.size () == c.size ());
+		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_sequence  ( v );
-    
-    std::list<int> l;
-    for ( int i = 25; i > 15; --i )
-        l.push_back ( i );
-    test_sequence  ( l );   
-    }
+	std::vector<int> v;
+	for ( int i = 5; i < 15; ++i )
+		v.push_back ( i );
+	test_sequence  ( v );
+	
+	std::list<int> l;
+	for ( int i = 25; i > 15; --i )
+		l.push_back ( i );
+	test_sequence  ( l );	
+	}
 
 
-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>
@@ -24,18 +22,18 @@ namespace ba = boost::algorithm;
 
 template <typename Container>
 typename Container::iterator offset_to_iter ( Container &v, int offset ) {
-    typename Container::iterator retval;
-    
-    if ( offset >= 0 ) {
-        retval = v.begin ();
-        std::advance ( retval, offset );
-        }
-    else {
-        retval = v.end ();
-        std::advance ( retval, offset + 1 );
-        }
-    return retval;
-    }
+	typename Container::iterator retval;
+	
+	if ( offset >= 0 ) {
+		retval = v.begin ();
+		std::advance ( retval, offset );
+		}
+	else {
+		retval = v.end ();
+		std::advance ( retval, offset + 1 );
+		}
+	return retval;
+	}
 
 template <typename Container, typename Predicate>
 void test_sequence ( Container &v, Predicate comp, int expected ) {
@@ -73,7 +71,7 @@ void test_sequence1 () {
     test_sequence ( v, less_than<int>(10), 5 );
     test_sequence ( v, less_than<int>(99), -1 );   // all elements satisfy 
 
-//  With bidirectional iterators.
+//	With bidirectional iterators.
     std::list<int> l;
     for ( int i = 5; i < 15; ++i )
         l.push_back ( i );
@@ -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* [] )
+//	should not compile: vector is not an integral type
+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;
 }