This commit was manufactured by cvs2svn to create tag

'Version_1_33_1'.

[SVN r31916]

include/boost/algorithm/minmax.hpp

@@ -1,7 +1,7 @@
 //  (C) Copyright Herve Bronnimann 2004.
-//
-// 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)
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 /*
  Revision history:

include/boost/algorithm/minmax_element.hpp

@@ -1,7 +1,7 @@
 //  (C) Copyright Herve Bronnimann 2004.
-//
-// 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)
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 /*
  Revision history:

include/boost/algorithm/string.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library string_algo.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2004.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2004. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_ALGO_HPP
 #define BOOST_STRING_ALGO_HPP

include/boost/algorithm/string/case_conv.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library case_conv.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CASE_CONV_HPP
 #define BOOST_STRING_CASE_CONV_HPP
@@ -16,7 +15,6 @@
 #include <locale>
 #include <boost/iterator/transform_iterator.hpp>
 
-#include <boost/range/as_literal.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/value_type.hpp>
@@ -57,10 +55,11 @@ namespace boost {
             const RangeT& Input,
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy( 
-               Output,
-               as_literal(Input),
-               ::boost::algorithm::detail::to_lowerF<
+            return std::transform( 
+                begin(Input), 
+                end(Input), 
+                Output,
+                ::boost::algorithm::detail::to_lowerF<
                     typename range_value<RangeT>::type >(Loc));
         }
 
@@ -73,10 +72,15 @@ namespace boost {
             const SequenceT& Input, 
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy<SequenceT>(
-                Input,
-                ::boost::algorithm::detail::to_lowerF<
-                    typename range_value<SequenceT>::type >(Loc));
+            return SequenceT(
+                make_transform_iterator(
+                    begin(Input),
+                    ::boost::algorithm::detail::to_lowerF<
+                        typename range_value<SequenceT>::type >(Loc)),
+                make_transform_iterator(
+                    end(Input), 
+                    ::boost::algorithm::detail::to_lowerF<
+                        typename range_value<SequenceT>::type >(Loc)));
         }
 
         //! Convert to lower case
@@ -92,8 +96,10 @@ namespace boost {
             WritableRangeT& Input, 
             const std::locale& Loc=std::locale())
         {
-            ::boost::algorithm::detail::transform_range(
-                as_literal(Input),
+            std::transform( 
+                begin(Input), 
+                end(Input), 
+                begin(Input), 
                 ::boost::algorithm::detail::to_lowerF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }
@@ -122,10 +128,11 @@ namespace boost {
             const RangeT& Input,
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy( 
-               Output,
-               as_literal(Input),
-               ::boost::algorithm::detail::to_upperF<
+            return std::transform( 
+                begin(Input), 
+                end(Input), 
+                Output,
+                ::boost::algorithm::detail::to_upperF<
                     typename range_value<RangeT>::type >(Loc));
         }
 
@@ -138,10 +145,16 @@ namespace boost {
             const SequenceT& Input, 
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy<SequenceT>(
-                Input,
-                ::boost::algorithm::detail::to_upperF<
-                    typename range_value<SequenceT>::type >(Loc));
+            return SequenceT(
+                make_transform_iterator(
+                    begin(Input),
+                    ::boost::algorithm::detail::to_upperF<
+                        typename range_value<SequenceT>::type >(Loc)),
+                make_transform_iterator(
+                    end(Input), 
+                    ::boost::algorithm::detail::to_upperF<
+                        typename range_value<SequenceT>::type >(Loc)));
+
         }
 
         //! Convert to upper case
@@ -157,8 +170,10 @@ namespace boost {
             WritableRangeT& Input, 
             const std::locale& Loc=std::locale())
         {
-            ::boost::algorithm::detail::transform_range(
-                as_literal(Input),
+            std::transform( 
+                begin(Input), 
+                end(Input), 
+                begin(Input), 
                 ::boost::algorithm::detail::to_upperF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }

include/boost/algorithm/string/classification.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library classification.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CLASSIFICATION_HPP
 #define BOOST_STRING_CLASSIFICATION_HPP
@@ -14,11 +13,9 @@
 #include <algorithm>
 #include <locale>
 #include <boost/range/value_type.hpp>
-#include <boost/range/as_literal.hpp>
 #include <boost/algorithm/string/detail/classification.hpp>
 #include <boost/algorithm/string/predicate_facade.hpp>
 
-
 /*! \file
     Classification predicates are included in the library to give 
     some more convenience when using algorithms like \c trim() and \c all(). 
@@ -203,7 +200,7 @@ namespace boost {
         is_any_of( const RangeT& Set )
         {
             return detail::is_any_ofF<
-                BOOST_STRING_TYPENAME range_value<RangeT>::type>(as_literal(Set)); 
+                BOOST_STRING_TYPENAME range_value<RangeT>::type>(Set); 
         }
 
         //! is_from_range predicate

include/boost/algorithm/string/compare.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library compare.hpp header file  -------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_COMPARE_HPP
 #define BOOST_STRING_COMPARE_HPP
@@ -38,7 +37,7 @@ namespace boost {
                 Compare two operands for equality
             */
             template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
+                bool operator ()( const T1& Arg1, const T2& Arg2 ) const
             {
                 return Arg1==Arg2;
             }
@@ -63,12 +62,12 @@ namespace boost {
                 Compare two operands. Case is ignored.
             */
             template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
+                bool operator ()( const T1& Arg1, const T2& Arg2 ) const
             {
                 #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     return std::toupper(Arg1)==std::toupper(Arg2);
                 #else
-                    return std::toupper<T1>(Arg1,m_Loc)==std::toupper<T2>(Arg2,m_Loc);
+                    return std::toupper(Arg1,m_Loc)==std::toupper(Arg2,m_Loc);
                 #endif
             }
 
@@ -76,122 +75,11 @@ namespace boost {
             std::locale m_Loc;
         };
 
-        //  is_less functor  -----------------------------------------------//
-
-        //! is_less functor
-        /*!
-            Convenient version of standard std::less. Operation is templated, therefore it is 
-            not required to specify the exact types upon the construction
-         */
-        struct is_less
-        {
-            //! Functor operation
-            /*!
-                Compare two operands using > operator
-             */
-            template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
-            {
-                return Arg1<Arg2;
-            }
-        };
-
-
-        //! case insensitive version of is_less
-        /*!
-            Case insensitive comparison predicate. Comparison is done using
-            specified locales.
-        */
-        struct is_iless
-        {
-            //! Constructor
-            /*!
-                \param Loc locales used for comparison
-            */
-            is_iless( const std::locale& Loc=std::locale() ) :
-                m_Loc( Loc ) {}
-
-            //! Function operator
-            /*!
-                Compare two operands. Case is ignored.
-            */
-            template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
-            {
-                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                    return std::toupper(Arg1)<std::toupper(Arg2);
-                #else
-                    return std::toupper<T1>(Arg1,m_Loc)<std::toupper<T2>(Arg2,m_Loc);
-                #endif
-            }
-
-        private:
-            std::locale m_Loc;
-        };
-
-        //  is_not_greater functor  -----------------------------------------------//
-
-        //! is_not_greater functor
-        /*!
-            Convenient version of standard std::not_greater_to. Operation is templated, therefore it is 
-            not required to specify the exact types upon the construction
-         */
-        struct is_not_greater
-        {
-            //! Functor operation
-            /*!
-                Compare two operands using > operator
-             */
-            template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
-            {
-                return Arg1<=Arg2;
-            }
-        };
-
-
-        //! case insensitive version of is_not_greater
-        /*!
-            Case insensitive comparison predicate. Comparison is done using
-            specified locales.
-        */
-        struct is_not_igreater
-        {
-            //! Constructor
-            /*!
-                \param Loc locales used for comparison
-            */
-            is_not_igreater( const std::locale& Loc=std::locale() ) :
-                m_Loc( Loc ) {}
-
-            //! Function operator
-            /*!
-                Compare two operands. Case is ignored.
-            */
-            template< typename T1, typename T2 >
-                bool operator()( const T1& Arg1, const T2& Arg2 ) const
-            {
-                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                    return std::toupper(Arg1)<=std::toupper(Arg2);
-                #else
-                    return std::toupper<T1>(Arg1,m_Loc)<=std::toupper<T2>(Arg2,m_Loc);
-                #endif
-            }
-
-        private:
-            std::locale m_Loc;
-        };
-
-
     } // namespace algorithm
 
     // pull names to the boost namespace
     using algorithm::is_equal;
     using algorithm::is_iequal;
-    using algorithm::is_less;
-    using algorithm::is_iless;
-    using algorithm::is_not_greater;
-    using algorithm::is_not_igreater;
 
 } // namespace boost
 

include/boost/algorithm/string/concept.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library concept.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CONCEPT_HPP
 #define BOOST_STRING_CONCEPT_HPP

include/boost/algorithm/string/config.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library config.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CONFIG_HPP
 #define BOOST_STRING_CONFIG_HPP

include/boost/algorithm/string/constants.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library constants.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CONSTANTS_HPP
 #define BOOST_STRING_CONSTANTS_HPP

include/boost/algorithm/string/detail/case_conv.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library string_funct.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CASE_CONV_DETAIL_HPP
 #define BOOST_STRING_CASE_CONV_DETAIL_HPP
@@ -34,7 +33,7 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::tolower( Ch);
                     #else
-                        return std::tolower<CharT>( Ch, m_Loc );
+                        return std::tolower( Ch, m_Loc );
                     #endif
                 }
             private:
@@ -54,56 +53,13 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::toupper( Ch);
                     #else
-                        return std::toupper<CharT>( Ch, m_Loc );
+                        return std::toupper( Ch, m_Loc );
                     #endif
                 }
             private:
                 const std::locale& m_Loc;
             };
 
-// algorithm implementation -------------------------------------------------------------------------
-
-            // Transform a range
-            template<typename OutputIteratorT, typename RangeT, typename FunctorT>
-            OutputIteratorT transform_range_copy(
-                OutputIteratorT Output,
-                const RangeT& Input,
-                FunctorT Functor)
-            {
-                return std::transform( 
-                    begin(Input), 
-                    end(Input), 
-                    Output,
-                    Functor);
-            }
-
-            // Transform a range (in-place)
-            template<typename RangeT, typename FunctorT>
-            void transform_range(
-                const RangeT& Input,
-                FunctorT Functor)
-            {
-                std::transform( 
-                    begin(Input), 
-                    end(Input), 
-                    begin(Input),
-                    Functor);
-            }
-
-            template<typename SequenceT, typename RangeT, typename FunctorT>
-            inline SequenceT transform_range_copy( 
-                const RangeT& Input, 
-                FunctorT Functor)
-            {
-                return SequenceT(
-                    make_transform_iterator(
-                        begin(Input),
-                        Functor),
-                    make_transform_iterator(
-                        end(Input), 
-                        Functor));
-            }
-
         } // namespace detail
     } // namespace algorithm
 } // namespace boost

include/boost/algorithm/string/detail/classification.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library classification.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-// 
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_CLASSIFICATION_DETAIL_HPP
 #define BOOST_STRING_CLASSIFICATION_DETAIL_HPP
@@ -47,7 +46,7 @@ namespace boost {
                     return std::use_facet< std::ctype<CharT> >(m_Locale).is( m_Type, Ch );
                 }
 
-                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x582) && !defined(_USE_OLD_RW_STL)
+                #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                     template<>
                     bool operator()( char const Ch ) const
                     {

include/boost/algorithm/string/detail/find_format.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_format.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-// 
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_FORMAT_DETAIL_HPP
 #define BOOST_STRING_FIND_FORMAT_DETAIL_HPP
@@ -27,17 +26,20 @@ namespace boost {
             template< 
                 typename OutputIteratorT,
                 typename InputT,
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT >
             inline OutputIteratorT find_format_copy_impl(
                 OutputIteratorT Output,
                 const InputT& Input,
+                FinderT Finder,
                 FormatterT Formatter,
                 const FindResultT& FindResult )
             {       
                 return find_format_copy_impl2( 
                     Output,
                     Input,
+                    Finder,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
@@ -46,12 +48,14 @@ namespace boost {
             template< 
                 typename OutputIteratorT,
                 typename InputT,
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT,
                 typename FormatResultT >
             inline OutputIteratorT find_format_copy_impl2(
                 OutputIteratorT Output,
                 const InputT& Input,
+                FinderT Finder,
                 FormatterT Formatter,
                 const FindResultT& FindResult,
                 const FormatResultT& FormatResult )
@@ -87,15 +91,18 @@ namespace boost {
 
             template< 
                 typename InputT, 
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT >
             inline InputT find_format_copy_impl(
                 const InputT& Input,
+                FinderT Finder,
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
                 return find_format_copy_impl2(
                     Input,
+                    Finder,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
@@ -103,11 +110,13 @@ namespace boost {
 
             template< 
                 typename InputT, 
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT,
                 typename FormatResultT >
             inline InputT find_format_copy_impl2(
                 const InputT& Input,
+                FinderT Finder,
                 FormatterT Formatter,
                 const FindResultT& FindResult,
                 const FormatResultT& FormatResult)
@@ -142,15 +151,18 @@ namespace boost {
         
             template<
                 typename InputT,
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT >
             inline void find_format_impl( 
                 InputT& Input,
+                FinderT Finder,
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
                 find_format_impl2(
                     Input,
+                    Finder,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
@@ -158,11 +170,13 @@ namespace boost {
 
             template<
                 typename InputT,
+                typename FinderT,
                 typename FormatterT,
                 typename FindResultT,
                 typename FormatResultT >
             inline void find_format_impl2( 
                 InputT& Input,
+                FinderT,
                 FormatterT Formatter,
                 const FindResultT& FindResult,
                 const FormatResultT& FormatResult)

include/boost/algorithm/string/detail/find_format_all.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_format_all.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
 #define BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP

include/boost/algorithm/string/detail/find_format_store.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_format_store.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
 #define BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP

include/boost/algorithm/string/detail/find_iterator.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_iterator.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_ITERATOR_DETAIL_HPP
 #define BOOST_STRING_FIND_ITERATOR_DETAIL_HPP

include/boost/algorithm/string/detail/finder.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library finder.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FINDER_DETAIL_HPP
 #define BOOST_STRING_FINDER_DETAIL_HPP
@@ -19,7 +18,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/empty.hpp>
-#include <boost/range/as_literal.hpp>
 
 namespace boost {
     namespace algorithm {
@@ -92,7 +90,7 @@ namespace boost {
 
 //  find last functor -----------------------------------------------//
 
-            // find the last match a subseqeunce in the sequence ( functor )
+            // find the last match a subsequnce in the sequence ( functor )
             /*
                 Returns a pair <begin,end> marking the subsequence in the sequence.
                 If the find fails, returns <End,End>
@@ -202,7 +200,7 @@ namespace boost {
 
 //  find n-th functor -----------------------------------------------//
 
-            // find the n-th match of a subsequence in the sequence ( functor )
+            // find the n-th match of a subsequnce in the sequence ( functor )
             /*
                 Returns a pair <begin,end> marking the subsequence in the sequence.
                 If the find fails, returns <End,End>
@@ -214,15 +212,12 @@ namespace boost {
                 typedef first_finderF<
                     search_iterator_type,
                     PredicateT> first_finder_type;
-                typedef last_finderF<
-                    search_iterator_type,
-                    PredicateT> last_finder_type;
 
                 // Construction
                 template< typename SearchT >
                 nth_finderF(
                         const SearchT& Search,
-                        int Nth,
+                        unsigned int Nth,
                         PredicateT Comp) :
                     m_Search(begin(Search), end(Search)),
                     m_Nth(Nth),
@@ -230,7 +225,7 @@ namespace boost {
                 nth_finderF(
                         search_iterator_type SearchBegin,
                         search_iterator_type SearchEnd,
-                        int Nth,
+                        unsigned int Nth,
                         PredicateT Comp) :
                     m_Search(SearchBegin, SearchEnd),
                     m_Nth(Nth),
@@ -242,26 +237,6 @@ namespace boost {
                 operator()(
                     ForwardIteratorT Begin,
                     ForwardIteratorT End ) const
-                {
-                    if(m_Nth>=0)
-                    {
-                        return find_forward(Begin, End, m_Nth);
-                    }
-                    else
-                    {
-                        return find_backward(Begin, End, -m_Nth);
-                    }
-
-                }
-
-            private:
-                // Implementation helpers
-                template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-                find_forward(
-                    ForwardIteratorT Begin,
-                    ForwardIteratorT End,
-                    unsigned int N) const
                 {
                     typedef ForwardIteratorT input_iterator_type;
                     typedef iterator_range<ForwardIteratorT> result_type;
@@ -270,13 +245,13 @@ namespace boost {
                     if( boost::empty(m_Search) )
                         return result_type( End, End );
 
-                    // Instantiate find functor
+                    // Instantiate find funtor
                     first_finder_type first_finder(
                         m_Search.begin(), m_Search.end(), m_Comp );
 
                     result_type M( Begin, Begin );
 
-                    for( unsigned int n=0; n<=N; ++n )
+                    for( unsigned int n=0; n<=m_Nth; ++n )
                     {
                         // find next match
                         M=first_finder( end(M), End );
@@ -291,179 +266,14 @@ namespace boost {
                     return M;
                 }
 
-                template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-                find_backward(
-                    ForwardIteratorT Begin,
-                    ForwardIteratorT End,
-                    unsigned int N) const
-                {
-                    typedef ForwardIteratorT input_iterator_type;
-                    typedef iterator_range<ForwardIteratorT> result_type;
-
-                    // Sanity check
-                    if( boost::empty(m_Search) )
-                        return result_type( End, End );
-
-                    // Instantiate find functor
-                    last_finder_type last_finder(
-                        m_Search.begin(), m_Search.end(), m_Comp );
-
-                    result_type M( End, End );
-
-                    for( unsigned int n=1; n<=N; ++n )
-                    {
-                        // find next match
-                        M=last_finder( Begin, begin(M) );
-
-                        if ( !M )
-                        {
-                            // Subsequence not found, return
-                            return M;
-                        }
-                    }
-
-                    return M;
-                }
-
-
             private:
                 iterator_range<search_iterator_type> m_Search;
-                int m_Nth;
+                unsigned int m_Nth;
                 PredicateT m_Comp;
             };
 
-//  find head/tail implementation helpers ---------------------------//
-
-            template<typename ForwardIteratorT>
-                iterator_range<ForwardIteratorT>
-            find_head_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                unsigned int N,
-                std::forward_iterator_tag )
-            {
-                typedef ForwardIteratorT input_iterator_type;
-                typedef iterator_range<ForwardIteratorT> result_type;
-
-                input_iterator_type It=Begin;
-                for(
-                    unsigned int Index=0;
-                    Index<N && It!=End; ++Index,++It ) {};
-
-                return result_type( Begin, It );
-            }
-
-            template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-            find_head_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                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 ) )
-                    return result_type( Begin, End );
-
-                return result_type(Begin,Begin+N);
-            }
-
-            // Find head implementation
-            template<typename ForwardIteratorT>
-                iterator_range<ForwardIteratorT>
-            find_head_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                unsigned int N )
-            {
-                typedef BOOST_STRING_TYPENAME boost::detail::
-                    iterator_traits<ForwardIteratorT>::iterator_category category;
-
-                return find_head_impl( Begin, End, N, category() );
-            }
-
-            template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-            find_tail_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                unsigned int N,
-                std::forward_iterator_tag )
-            {
-                typedef ForwardIteratorT input_iterator_type;
-                typedef iterator_range<ForwardIteratorT> result_type;
-
-                unsigned int Index=0;
-                input_iterator_type It=Begin;
-                input_iterator_type It2=Begin;
-
-                // Advance It2 by N increments
-                for( Index=0; Index<N && It2!=End; ++Index,++It2 ) {};
-
-                // Advance It, It2 to the end
-                for(; It2!=End; ++It,++It2 ) {};
-
-                return result_type( It, It2 );
-            }
-
-            template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-            find_tail_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                unsigned int N,
-                std::bidirectional_iterator_tag )
-            {
-                typedef ForwardIteratorT input_iterator_type;
-                typedef iterator_range<ForwardIteratorT> result_type;
-
-                input_iterator_type It=End;
-                for(
-                    unsigned int Index=0;
-                    Index<N && It!=Begin; ++Index,--It ) {};
-
-                return result_type( It, End );
-            }
-
-            template< typename ForwardIteratorT >
-                iterator_range<ForwardIteratorT>
-            find_tail_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                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 ) )
-                    return result_type( Begin, End );
-
-                return result_type( End-N, End );
-            }
-
-                        // Operation
-            template< typename ForwardIteratorT >
-            iterator_range<ForwardIteratorT>
-            find_tail_impl(
-                ForwardIteratorT Begin,
-                ForwardIteratorT End,
-                unsigned int N )
-            {
-                typedef BOOST_STRING_TYPENAME boost::detail::
-                    iterator_traits<ForwardIteratorT>::iterator_category category;
-
-                return find_tail_impl( Begin, End, N, category() );
-            }
-
-
-
 //  find head functor -----------------------------------------------//
 
-
             // find a head in the sequence ( functor )
             /*
                 This functor find a head of the specified range. For
@@ -473,7 +283,7 @@ namespace boost {
             struct head_finderF
             {
                 // Construction
-                head_finderF( int N ) : m_N(N) {}
+                head_finderF( unsigned int N ) : m_N(N) {}
 
                 // Operation
                 template< typename ForwardIteratorT >
@@ -482,26 +292,54 @@ namespace boost {
                     ForwardIteratorT Begin,
                     ForwardIteratorT End ) const
                 {
-                    if(m_N>=0)
-                    {
-                        return find_head_impl( Begin, End, m_N );
-                    }
-                    else
-                    {
-                        iterator_range<ForwardIteratorT> Res=
-                            find_tail_impl( Begin, End, -m_N );
+                    typedef BOOST_STRING_TYPENAME boost::detail::
+                        iterator_traits<ForwardIteratorT>::iterator_category category;
 
-                        return make_iterator_range(Begin, Res.begin());
-                    }
+                    return findit( Begin, End, category() );
                 }
 
             private:
-                int m_N;
+                // Find operation implementation
+                template< typename ForwardIteratorT >
+                    iterator_range<ForwardIteratorT>
+                findit(
+                    ForwardIteratorT Begin,
+                    ForwardIteratorT End,
+                    std::forward_iterator_tag ) const
+                {
+                    typedef ForwardIteratorT input_iterator_type;
+                    typedef iterator_range<ForwardIteratorT> result_type;
+
+                    input_iterator_type It=Begin;
+                    for(
+                        unsigned int Index=0;
+                        Index<m_N && It!=End; ++Index,++It ) {};
+
+                    return result_type( Begin, It );
+                }
+
+                template< typename ForwardIteratorT >
+                    iterator_range<ForwardIteratorT>
+                findit(
+                    ForwardIteratorT Begin,
+                    ForwardIteratorT End,
+                    std::random_access_iterator_tag ) const
+                {
+                    typedef ForwardIteratorT input_iterator_type;
+                    typedef iterator_range<ForwardIteratorT> result_type;
+
+                    if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < m_N ) )
+                        return result_type( Begin, End );
+
+                    return result_type(Begin,Begin+m_N);
+                }
+
+            private:
+                unsigned int m_N;
             };
 
 //  find tail functor -----------------------------------------------//
 
-
             // find a tail in the sequence ( functor )
             /*
                 This functor find a tail of the specified range. For
@@ -511,7 +349,7 @@ namespace boost {
             struct tail_finderF
             {
                 // Construction
-                tail_finderF( int N ) : m_N(N) {}
+                tail_finderF( unsigned int N ) : m_N(N) {}
 
                 // Operation
                 template< typename ForwardIteratorT >
@@ -520,21 +358,74 @@ namespace boost {
                     ForwardIteratorT Begin,
                     ForwardIteratorT End ) const
                 {
-                    if(m_N>=0)
-                    {
-                        return find_tail_impl( Begin, End, m_N );
-                    }
-                    else
-                    {
-                        iterator_range<ForwardIteratorT> Res=
-                            find_head_impl( Begin, End, -m_N );
+                    typedef BOOST_STRING_TYPENAME boost::detail::
+                        iterator_traits<ForwardIteratorT>::iterator_category category;
 
-                        return make_iterator_range(Res.end(), End);
-                    }
+                    return findit( Begin, End, category() );
                 }
 
             private:
-                int m_N;
+                // Find operation implementation
+                template< typename ForwardIteratorT >
+                    iterator_range<ForwardIteratorT>
+                findit(
+                    ForwardIteratorT Begin,
+                    ForwardIteratorT End,
+                    std::forward_iterator_tag ) const
+                {
+                    typedef ForwardIteratorT input_iterator_type;
+                    typedef iterator_range<ForwardIteratorT> result_type;
+
+                    unsigned int Index=0;
+                    input_iterator_type It=Begin;
+                    input_iterator_type It2=Begin;
+
+                    // Advance It2 by N incremets
+                    for( Index=0; Index<m_N && It2!=End; ++Index,++It2 ) {};
+
+                    // Advance It, It2 to the end
+                    for(; It2!=End; ++It,++It2 ) {};
+
+                    return result_type( It, It2 );
+                }
+
+                template< typename ForwardIteratorT >
+                    iterator_range<ForwardIteratorT>
+                findit(
+                    ForwardIteratorT Begin,
+                    ForwardIteratorT End,
+                    std::bidirectional_iterator_tag ) const
+                {
+                    typedef ForwardIteratorT input_iterator_type;
+                    typedef iterator_range<ForwardIteratorT> result_type;
+
+                    input_iterator_type It=End;
+                    for(
+                        unsigned int Index=0;
+                        Index<m_N && It!=Begin; ++Index,--It ) {};
+
+                    return result_type( It, End );
+                }
+
+                template< typename ForwardIteratorT >
+                    iterator_range<ForwardIteratorT>
+                findit(
+                    ForwardIteratorT Begin,
+                    ForwardIteratorT End,
+                    std::random_access_iterator_tag ) const
+                {
+                    typedef ForwardIteratorT input_iterator_type;
+                    typedef iterator_range<ForwardIteratorT> result_type;
+
+                    if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < m_N ) )
+                        return result_type( Begin, End );
+
+                    return result_type( End-m_N, End );
+                }
+
+
+            private:
+                unsigned int m_N;
             };
 
 //  find token functor -----------------------------------------------//
@@ -584,7 +475,7 @@ namespace boost {
                         }
                         else
                         {
-                            // Advance by one position
+                            // Advance by one possition
                             ++It2;
                         }
 

include/boost/algorithm/string/detail/finder_regex.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_regex.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FINDER_REGEX_DETAIL_HPP
 #define BOOST_STRING_FINDER_REGEX_DETAIL_HPP

include/boost/algorithm/string/detail/formatter.hpp

@@ -1,10 +1,9 @@
 //  Boost string_algo library formatter.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 

include/boost/algorithm/string/detail/formatter_regex.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library formatter_regex.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FORMATTER_REGEX_DETAIL_HPP
 #define BOOST_STRING_FORMATTER_REGEX_DETAIL_HPP

include/boost/algorithm/string/detail/predicate.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library predicate.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_PREDICATE_DETAIL_HPP
 #define BOOST_STRING_PREDICATE_DETAIL_HPP

include/boost/algorithm/string/detail/replace_storage.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library replace_storage.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
 #define BOOST_STRING_REPLACE_STORAGE_DETAIL_HPP

include/boost/algorithm/string/detail/sequence.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library sequence.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_DETAIL_SEQUENCE_HPP
 #define BOOST_STRING_DETAIL_SEQUENCE_HPP

include/boost/algorithm/string/detail/trim.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library trim.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_TRIM_DETAIL_HPP
 #define BOOST_STRING_TRIM_DETAIL_HPP

include/boost/algorithm/string/detail/util.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library util.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_UTIL_DETAIL_HPP
 #define BOOST_STRING_UTIL_DETAIL_HPP

include/boost/algorithm/string/erase.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library erase.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_ERASE_HPP
 #define BOOST_STRING_ERASE_HPP
@@ -388,7 +387,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input
 
@@ -402,7 +400,7 @@ namespace boost {
             OutputIteratorT Output,
             const Range1T& Input,
             const Range2T& Search,
-            int Nth )
+            unsigned int Nth )
         {
             return find_format_copy(
                 Output,
@@ -419,7 +417,7 @@ namespace boost {
         inline SequenceT erase_nth_copy( 
             const SequenceT& Input,
             const RangeT& Search,
-            int Nth )
+            unsigned int Nth )
         {
             return find_format_copy( 
                 Input, 
@@ -435,13 +433,12 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for. 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
         */
         template<typename SequenceT, typename RangeT>
         inline void erase_nth( 
             SequenceT& Input,
             const RangeT& Search,
-            int Nth )
+            unsigned int Nth )
         {
             find_format( 
                 Input, 
@@ -462,7 +459,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for.
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Loc A locale used for case insensitive comparison
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input
@@ -477,7 +473,7 @@ namespace boost {
             OutputIteratorT Output,
             const Range1T& Input,
             const Range2T& Search,
-            int Nth,
+            unsigned int Nth,
             const std::locale& Loc=std::locale() )
         {
             return find_format_copy(
@@ -495,7 +491,7 @@ namespace boost {
         inline SequenceT ierase_nth_copy( 
             const SequenceT& Input,
             const RangeT& Search,
-            int Nth,
+            unsigned int Nth,
             const std::locale& Loc=std::locale() )
         {
             return find_format_copy( 
@@ -512,14 +508,13 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for. 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Loc A locale used for case insensitive comparison
         */
         template<typename SequenceT, typename RangeT>
         inline void ierase_nth( 
             SequenceT& Input,
             const RangeT& Search,
-            int Nth,
+            unsigned int Nth,
             const std::locale& Loc=std::locale() )
         {
             find_format( 
@@ -680,9 +675,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input string
-            \param N Length of the head.
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the head
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input
 
@@ -694,7 +687,7 @@ namespace boost {
         inline OutputIteratorT erase_head_copy(
             OutputIteratorT Output,
             const RangeT& Input,
-            int N )
+            unsigned int N )
         {
             return find_format_copy(
                 Output,
@@ -710,7 +703,7 @@ namespace boost {
         template<typename SequenceT>
         inline SequenceT erase_head_copy( 
             const SequenceT& Input,
-            int N )
+            unsigned int N )
         {
             return find_format_copy( 
                 Input,
@@ -726,13 +719,11 @@ namespace boost {
 
             \param Input An input string
             \param N Length of the head
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
         */
         template<typename SequenceT>
         inline void erase_head( 
             SequenceT& Input,
-            int N )
+            unsigned int N )
         {
             find_format( 
                 Input, 
@@ -752,9 +743,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input string
-            \param N Length of the head.                 
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the head
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input
             
@@ -766,7 +755,7 @@ namespace boost {
         inline OutputIteratorT erase_tail_copy(
             OutputIteratorT Output,
             const RangeT& Input,
-            int N )
+            unsigned int N )
         {
             return find_format_copy(
                 Output,
@@ -782,7 +771,7 @@ namespace boost {
         template<typename SequenceT>
         inline SequenceT erase_tail_copy( 
             const SequenceT& Input,
-            int N )
+            unsigned int N )
         {
             return find_format_copy( 
                 Input,
@@ -798,13 +787,11 @@ namespace boost {
 
             \param Input An input string
             \param N Length of the head
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
         */
         template<typename SequenceT>
         inline void erase_tail( 
             SequenceT& Input,
-            int N )
+            unsigned int N )
         {
             find_format( 
                 Input, 

include/boost/algorithm/string/find.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_HPP
 #define BOOST_STRING_FIND_HPP
@@ -19,7 +18,6 @@
 #include <boost/range/iterator.hpp>
 #include <boost/range/const_iterator.hpp>
 #include <boost/range/result_iterator.hpp>
-#include <boost/range/as_literal.hpp>
 
 #include <boost/algorithm/string/finder.hpp>
 #include <boost/algorithm/string/compare.hpp>
@@ -53,18 +51,16 @@ namespace boost {
             BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
         find( 
             RangeT& Input, 
-            const FinderT& Finder)
+            FinderT Finder)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
-
-            return Finder(begin(lit_input),end(lit_input));
+            return Finder(begin(Input),end(Input));
         }
 
 //  find_first  -----------------------------------------------//
 
         //! Find first algorithm
         /*!
-            Search for the first occurrence of the substring in the input. 
+            Search for the first occurence of the substring in the input. 
             
             \param Input A string which will be searched.
             \param Search A substring to be searched for.
@@ -83,7 +79,8 @@ namespace boost {
             Range1T& Input, 
             const Range2T& Search)
         {
-            return find(Input, first_finder(Search));
+            return first_finder(Search)(
+                begin(Input),end(Input));
         }
 
         //! Find first algorithm ( case insensitive )
@@ -110,14 +107,15 @@ namespace boost {
             const Range2T& Search,
             const std::locale& Loc=std::locale())
         {
-            return find(Input, first_finder(Search,is_iequal(Loc)));
+            return first_finder(Search,is_iequal(Loc))(
+                begin(Input),end(Input));
         }
 
 //  find_last  -----------------------------------------------//
 
         //! Find last algorithm
         /*!
-            Search for the last occurrence of the substring in the input. 
+            Search for the last occurence of the substring in the input. 
             
             \param Input A string which will be searched.
             \param Search A substring to be searched for.
@@ -136,7 +134,8 @@ namespace boost {
             Range1T& Input, 
             const Range2T& Search)
         {
-            return find(Input, last_finder(Search));
+            return last_finder(Search)(
+                begin(Input),end(Input));
         }
 
         //! Find last algorithm ( case insensitive )
@@ -163,20 +162,20 @@ namespace boost {
             const Range2T& Search,
             const std::locale& Loc=std::locale())
         {
-            return find(Input, last_finder(Search, is_iequal(Loc)));
+            return last_finder(Search, is_iequal(Loc))(
+                begin(Input),end(Input));
         }
 
 //  find_nth ----------------------------------------------------------------------//
 
         //! Find n-th algorithm 
         /*!
-            Search for the n-th (zero-indexed) occurrence of the substring in the 
+            Search for the n-th (zero-indexed) occurence of the substring in the 
             input.         
             
             \param Input A string which will be searched.
             \param Search A substring to be searched for.
             \param Nth An index (zero-indexed) of the match to be found.
-                For negative N, the matches are counted from the end of string.
             \return 
                 An \c iterator_range delimiting the match. 
                 Returned iterator is either \c Range1T::iterator or 
@@ -189,20 +188,20 @@ namespace boost {
         find_nth( 
             Range1T& Input, 
             const Range2T& Search,
-            int Nth)
+            unsigned int Nth)
         {
-            return find(Input, nth_finder(Search,Nth));
+            return nth_finder(Search,Nth)(
+                begin(Input),end(Input));
         }
 
         //! Find n-th algorithm ( case insensitive ).
         /*!
-            Search for the n-th (zero-indexed) occurrence of the substring in the 
+            Search for the n-th (zero-indexed) occurence of the substring in the 
             input. Searching is case insensitive.
             
             \param Input A string which will be searched.
             \param Search A substring to be searched for.
-            \param Nth An index (zero-indexed) of the match to be found. 
-                For negative N, the matches are counted from the end of string.
+            \param Nth An index (zero-indexed) of the match to be found.
             \param Loc A locale used for case insensitive comparison
             \return 
                 An \c iterator_range delimiting the match. 
@@ -219,10 +218,11 @@ namespace boost {
         ifind_nth( 
             Range1T& Input, 
             const Range2T& Search,
-            int Nth,
+            unsigned int Nth,
             const std::locale& Loc=std::locale())
         {
-            return find(Input, nth_finder(Search,Nth,is_iequal(Loc)));
+            return nth_finder(Search,Nth,is_iequal(Loc))(
+                begin(Input),end(Input));
         }
 
 //  find_head ----------------------------------------------------------------------//
@@ -235,8 +235,6 @@ namespace boost {
 
             \param Input An input string
             \param N Length of the head
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
             \return 
                 An \c iterator_range delimiting the match. 
                 Returned iterator is either \c Range1T::iterator or 
@@ -250,9 +248,10 @@ namespace boost {
             BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
         find_head( 
             RangeT& Input, 
-            int N)
+            unsigned int N)
         {
-            return find(Input, head_finder(N));
+            return head_finder(N)(
+                begin(Input),end(Input));      
         }
 
 //  find_tail ----------------------------------------------------------------------//
@@ -264,9 +263,7 @@ namespace boost {
             to be the tail.
 
             \param Input An input string
-            \param N Length of the tail. 
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the tail
             \return 
                 An \c iterator_range delimiting the match. 
                 Returned iterator is either \c RangeT::iterator or 
@@ -281,9 +278,10 @@ namespace boost {
             BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
         find_tail( 
             RangeT& Input, 
-            int N)
+            unsigned int N)
         {
-            return find(Input, tail_finder(N));
+            return tail_finder(N)(
+                begin(Input),end(Input));      
         }
 
 //  find_token --------------------------------------------------------------------//
@@ -313,7 +311,8 @@ namespace boost {
             PredicateT Pred,
             token_compress_mode_type eCompress=token_compress_off)
         {
-            return find(Input, token_finder(Pred, eCompress));
+            return token_finder(Pred, eCompress)(
+                begin(Input),end(Input));       
         }
 
     } // namespace algorithm

include/boost/algorithm/string/find_format.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library find_format.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_FORMAT_HPP
 #define BOOST_STRING_FIND_FORMAT_HPP
@@ -69,13 +68,12 @@ namespace boost {
                     FormatterT,
                     FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
 
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             return detail::find_format_copy_impl(
                 Output,
-                lit_input,
+                Input,
+                Finder,
                 Formatter,
-                Finder( begin(lit_input), end(lit_input) ) );
+                Finder( begin(Input), end(Input) ) );
         }
 
         //! Generic replace algorithm
@@ -102,6 +100,7 @@ namespace boost {
 
             return detail::find_format_copy_impl(
                 Input,
+                Finder,
                 Formatter,
                 Finder(begin(Input), end(Input)));
         }
@@ -135,6 +134,7 @@ namespace boost {
 
             detail::find_format_impl(
                 Input,
+                Finder,
                 Formatter,
                 Finder(begin(Input), end(Input)));
         }
@@ -179,14 +179,12 @@ namespace boost {
                     FormatterT,
                     FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
 
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             return detail::find_format_all_copy_impl(
                 Output,
-                lit_input,
+                Input,
                 Finder,
                 Formatter,
-                Finder(begin(lit_input), end(lit_input)));
+                Finder(begin(Input), end(Input)));
         }
 
         //! Generic replace all algorithm

include/boost/algorithm/string/find_iterator.hpp

@@ -1,12 +1,10 @@
 //  Boost string_algo library find_iterator.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2004.
-//
-// 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)
-
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  Copyright Pavol Droba 2002-2004. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FIND_ITERATOR_HPP
 #define BOOST_STRING_FIND_ITERATOR_HPP
@@ -19,7 +17,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/result_iterator.hpp>
-#include <boost/range/as_literal.hpp>
 
 #include <boost/algorithm/string/detail/find_iterator.hpp>
 
@@ -117,12 +114,10 @@ namespace boost {
             find_iterator(
                     RangeT& Col,
                     FinderT Finder ) :
-                detail::find_iterator_base<IteratorT>(Finder,0)
+                detail::find_iterator_base<IteratorT>(Finder,0),
+                m_Match(begin(Col),begin(Col)),
+                m_End(end(Col))
             {
-                iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(as_literal(Col));
-                m_Match=make_iterator_range(begin(lit_col), begin(lit_col));
-                m_End=end(lit_col);
-
                 increment();
             }
 
@@ -191,7 +186,7 @@ namespace boost {
             FinderT Finder)
         {
             return find_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
-                Collection, Finder);
+                begin(Collection), end(Collection), Finder);
         }
 
 //  split iterator -----------------------------------------------//
@@ -283,13 +278,11 @@ namespace boost {
                     RangeT& Col,
                     FinderT Finder ) :
                 detail::find_iterator_base<IteratorT>(Finder,0),
+                m_Match(begin(Col),begin(Col)),
+                m_Next(begin(Col)),
+                m_End(end(Col)),
                 m_bEof(false)
             {
-                iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(as_literal(Col));
-                m_Match=make_iterator_range(begin(lit_col), begin(lit_col));
-                m_Next=begin(lit_col);
-                m_End=end(lit_col);
-
                 increment();
             }
 
@@ -369,7 +362,7 @@ namespace boost {
             FinderT Finder)
         {
             return split_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
-                Collection, Finder);
+                begin(Collection), end(Collection), Finder);
         }
 
 

include/boost/algorithm/string/finder.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library finder.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FINDER_HPP
 #define BOOST_STRING_FINDER_HPP
@@ -46,35 +45,35 @@ namespace boost {
             \param Comp An element comparison predicate
             \return An instance of the \c first_finder object
         */
-        template<typename RangeT>
+        template<typename ContainerT>
         inline detail::first_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             is_equal>
-        first_finder( const RangeT& Search )
+        first_finder( const ContainerT& Search )
         {
             return 
                 detail::first_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    is_equal>( as_literal(Search), is_equal() ) ;
+                        range_const_iterator<ContainerT>::type,
+                    is_equal>( Search, is_equal() ) ;
         }
 
         //! "First" finder
         /*!
             \overload
         */
-        template<typename RangeT,typename PredicateT>
+        template<typename ContainerT,typename PredicateT>
         inline detail::first_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             PredicateT>
         first_finder( 
-            const RangeT& Search, PredicateT Comp )
+            const ContainerT& Search, PredicateT Comp )
         {
             return 
                 detail::first_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    PredicateT>( as_literal(Search), Comp );
+                        range_const_iterator<ContainerT>::type,
+                    PredicateT>( Search, Comp );
         }
 
         //! "Last" finder
@@ -87,33 +86,33 @@ namespace boost {
             \param Comp An element comparison predicate
             \return An instance of the \c last_finder object
         */
-        template<typename RangeT>
+        template<typename ContainerT>
         inline detail::last_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             is_equal>
-        last_finder( const RangeT& Search )
+        last_finder( const ContainerT& Search )
         {
             return 
                 detail::last_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    is_equal>( as_literal(Search), is_equal() );
+                        range_const_iterator<ContainerT>::type,
+                    is_equal>( Search, is_equal() );
         }
         //! "Last" finder
         /*!
             \overload
         */
-        template<typename RangeT, typename PredicateT>
+        template<typename ContainerT, typename PredicateT>
         inline detail::last_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             PredicateT>
-        last_finder( const RangeT& Search, PredicateT Comp )
+        last_finder( const ContainerT& Search, PredicateT Comp )
         {
             return 
                 detail::last_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    PredicateT>( as_literal(Search), Comp ) ;
+                        range_const_iterator<ContainerT>::type,
+                    PredicateT>( Search, Comp ) ;
         }
 
         //! "Nth" finder
@@ -127,38 +126,38 @@ namespace boost {
             \param Comp An element comparison predicate
             \return An instance of the \c nth_finder object
         */
-        template<typename RangeT>
+        template<typename ContainerT>
         inline detail::nth_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             is_equal>
         nth_finder( 
-            const RangeT& Search, 
-            int Nth)
+            const ContainerT& Search, 
+            unsigned int Nth)
         {
             return 
                 detail::nth_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    is_equal>( as_literal(Search), Nth, is_equal() ) ;
+                        range_const_iterator<ContainerT>::type,
+                    is_equal>( Search, Nth, is_equal() ) ;
         }
         //! "Nth" finder
         /*!
             \overload
         */
-        template<typename RangeT, typename PredicateT>
+        template<typename ContainerT, typename PredicateT>
         inline detail::nth_finderF<
-            BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type,
+            BOOST_STRING_TYPENAME range_const_iterator<ContainerT>::type,
             PredicateT>
         nth_finder( 
-            const RangeT& Search, 
-            int Nth, 
+            const ContainerT& Search, 
+            unsigned int Nth, 
             PredicateT Comp )
         {
             return 
                 detail::nth_finderF<
                     BOOST_STRING_TYPENAME 
-                        range_const_iterator<RangeT>::type,
-                    PredicateT>( as_literal(Search), Nth, Comp );
+                        range_const_iterator<ContainerT>::type,
+                    PredicateT>( Search, Nth, Comp );
         }
 
         //! "Head" finder
@@ -173,7 +172,7 @@ namespace boost {
             \return An instance of the \c head_finder object
         */
         inline detail::head_finderF
-        head_finder( int N )
+        head_finder( unsigned int N )
         {
             return detail::head_finderF(N);
         }
@@ -190,7 +189,7 @@ namespace boost {
             \return An instance of the \c tail_finder object
         */
         inline detail::tail_finderF
-        tail_finder( int N )
+        tail_finder( unsigned int N )
         {
             return detail::tail_finderF(N);
         }

include/boost/algorithm/string/formatter.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library formatter.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_FORMATTER_HPP
 #define BOOST_STRING_FORMATTER_HPP
@@ -14,7 +13,6 @@
 #include <boost/detail/iterator.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/range/iterator_range.hpp>
-#include <boost/range/as_literal.hpp>
 
 #include <boost/algorithm/string/detail/formatter.hpp>
 
@@ -43,14 +41,10 @@ namespace boost {
             \return An instance of the \c const_formatter object.
         */
         template<typename RangeT>
-        inline detail::const_formatF<
-            iterator_range<
-                BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >
+        inline detail::const_formatF<RangeT>
         const_formatter(const RangeT& Format)
         {
-            return detail::const_formatF<
-                iterator_range<
-                    BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >(as_literal(Format));
+            return detail::const_formatF<RangeT>(Format);
         }
 
         //! Identity formatter
@@ -61,14 +55,10 @@ namespace boost {
             \return An instance of the \c identity_formatter object.
         */
         template<typename RangeT>
-        inline detail::identity_formatF<
-            iterator_range<
-                BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >
+        inline detail::identity_formatF<RangeT>
         identity_formatter()
         {
-            return detail::identity_formatF<
-                iterator_range<
-                    BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
+            return detail::identity_formatF<RangeT>();
         }
 
         //! Empty formatter

include/boost/algorithm/string/iter_find.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library iter_find.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_ITER_FIND_HPP
 #define BOOST_STRING_ITER_FIND_HPP
@@ -21,7 +20,6 @@
 #include <boost/range/end.hpp>
 #include <boost/range/result_iterator.hpp>
 #include <boost/range/value_type.hpp>
-#include <boost/range/as_literal.hpp>
 
 #include <boost/algorithm/string/concept.hpp>
 #include <boost/algorithm/string/find_iterator.hpp>
@@ -78,8 +76,6 @@ namespace boost {
                 FinderConcept<FinderT,
                 BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
 
-            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             typedef BOOST_STRING_TYPENAME 
                 range_result_iterator<RangeT>::type input_iterator_type;
             typedef find_iterator<input_iterator_type> find_iterator_type;
@@ -88,14 +84,14 @@ namespace boost {
                     range_value<SequenceSequenceT>::type,
                 input_iterator_type> copy_range_type;
             
-            input_iterator_type InputEnd=end(lit_input);
+            input_iterator_type InputEnd=end(Input);
 
             typedef transform_iterator<copy_range_type, find_iterator_type>
                 transform_iter_type;
     
             transform_iter_type itBegin=
                 make_transform_iterator( 
-                    find_iterator_type( begin(lit_input), InputEnd, Finder ),
+                    find_iterator_type( begin(Input), InputEnd, Finder ),
                     copy_range_type());
             
             transform_iter_type itEnd=
@@ -147,8 +143,6 @@ namespace boost {
                 FinderConcept<FinderT,
                 BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
 
-            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             typedef BOOST_STRING_TYPENAME 
                 range_result_iterator<RangeT>::type input_iterator_type;
             typedef split_iterator<input_iterator_type> find_iterator_type;
@@ -157,14 +151,14 @@ namespace boost {
                     range_value<SequenceSequenceT>::type,
                 input_iterator_type> copy_range_type;
             
-            input_iterator_type InputEnd=end(lit_input);
+            input_iterator_type InputEnd=end(Input);
 
             typedef transform_iterator<copy_range_type, find_iterator_type>
                 transform_iter_type;
     
             transform_iter_type itBegin=
                 make_transform_iterator( 
-                    find_iterator_type( begin(lit_input), InputEnd, Finder ),
+                    find_iterator_type( begin(Input), InputEnd, Finder ),
                     copy_range_type() );
 
             transform_iter_type itEnd=

include/boost/algorithm/string/join.hpp

@@ -1,145 +0,0 @@
-//  Boost string_algo library join.hpp header file  ---------------------------//
-
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
-
-//  See http://www.boost.org/ for updates, documentation, and revision history.
-
-#ifndef BOOST_STRING_JOIN_HPP
-#define BOOST_STRING_JOIN_HPP
-
-#include <boost/algorithm/string/config.hpp>
-#include <boost/algorithm/string/detail/sequence.hpp>
-#include <boost/range/value_type.hpp>
-
-
-/*! \file
-    Defines join algorithm. 
-
-    Join algorithm is a counterpart to split algorithms.
-    It joins strings from a 'list' by adding user defined separator.
-    Additionally there is a version that allows simple filtering
-    by providing a predicate.
-*/
-
-namespace boost {
-    namespace algorithm {
-
-//  join --------------------------------------------------------------//
-
-        //! Join algorithm
-        /*!
-            This algorithm joins all strings in a 'list' into one long string.
-            Segments are concatenated by given separator.
-
-            \param Input A container that holds the input strings. It must be a container-of-containers.
-            \param Separator A string that will separate the joined segments.
-            \return Concatenated string.
-
-            \note This function provides the strong exception-safety guarantee
-        */
-        template< typename SequenceSequenceT, typename Range1T>
-        inline typename range_value<SequenceSequenceT>::type 
-        join(
-            const SequenceSequenceT& Input,
-            const Range1T& Separator)
-        {
-            // Define working types
-            typedef typename range_value<SequenceSequenceT>::type ResultT;
-            typedef typename range_const_iterator<SequenceSequenceT>::type InputIteratorT;
-
-            // Parse input
-            InputIteratorT itBegin=begin(Input);
-            InputIteratorT itEnd=end(Input);
-
-            // Construct container to hold the result
-            ResultT Result;
-            
-            // Append first element
-            if(itBegin!=itEnd)
-            {
-                detail::insert(Result, end(Result), *itBegin);
-                ++itBegin;
-            }
-
-            for(;itBegin!=itEnd; ++itBegin)
-            {
-                // Add separator
-                detail::insert(Result, end(Result), as_literal(Separator));
-                // Add element
-                detail::insert(Result, end(Result), *itBegin);
-            }
-
-            return Result;
-        }
-
-// join_if ----------------------------------------------------------//
-
-        //! Conditional join algorithm
-        /*!
-            This algorithm joins all strings in a 'list' into one long string.
-            Segments are concatenated by given separator. Only segments that
-            satisfy the predicate will be added to the result.
-
-            \param Input A container that holds the input strings. It must be a container-of-containers.
-            \param Separator A string that will separate the joined segments.
-            \param Pred A segment selection predicate
-            \return Concatenated string.
-
-            \note This function provides the strong exception-safety guarantee
-        */
-        template< typename SequenceSequenceT, typename Range1T, typename PredicateT>
-        inline typename range_value<SequenceSequenceT>::type 
-        join_if(
-            const SequenceSequenceT& Input,
-            const Range1T& Separator,
-            PredicateT Pred)
-        {
-            // Define working types
-            typedef typename range_value<SequenceSequenceT>::type ResultT;
-            typedef typename range_const_iterator<SequenceSequenceT>::type InputIteratorT;
-
-            // Parse input
-            InputIteratorT itBegin=begin(Input);
-            InputIteratorT itEnd=end(Input);
-
-            // Construct container to hold the result
-            ResultT Result;
-
-            // Roll to the first element that will be added
-            while(itBegin!=itEnd && !Pred(*itBegin)) ++itBegin;
-            // Add this element
-            if(itBegin!=itEnd)
-            {
-                detail::insert(Result, end(Result), *itBegin);
-                ++itBegin;
-            }
-
-            for(;itBegin!=itEnd; ++itBegin)
-            {
-                if(Pred(*itBegin))
-                {
-                    // Add separator
-                    detail::insert(Result, end(Result), as_literal(Separator));
-                    // Add element
-                    detail::insert(Result, end(Result), *itBegin);
-                }
-            }
-
-            return Result;
-        }
-
-    } // namespace algorithm
-
-    // pull names to the boost namespace
-    using algorithm::join;
-    using algorithm::join_if;
-
-} // namespace boost
-
-
-#endif  // BOOST_STRING_JOIN_HPP
-

include/boost/algorithm/string/predicate.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library predicate.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_PREDICATE_HPP
 #define BOOST_STRING_PREDICATE_HPP
@@ -16,8 +15,6 @@
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/range/const_iterator.hpp>
-#include <boost/range/as_literal.hpp>
-#include <boost/range/iterator_range.hpp>
 
 #include <boost/algorithm/string/compare.hpp>
 #include <boost/algorithm/string/find.hpp>
@@ -59,19 +56,16 @@ namespace boost {
             const Range2T& Test,
             PredicateT Comp)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
-
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<Range1T>::type Iterator1T;
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<Range2T>::type Iterator2T;
 
-            Iterator1T InputEnd=end(lit_input);
-            Iterator2T TestEnd=end(lit_test);
+            Iterator1T InputEnd=end(Input);
+            Iterator2T TestEnd=end(Test);
 
-            Iterator1T it=begin(lit_input);
-            Iterator2T pit=begin(lit_test);
+            Iterator1T it=begin(Input);
+            Iterator2T pit=begin(Test);
             for(;
                 it!=InputEnd && pit!=TestEnd;
                 ++it,++pit)
@@ -141,9 +135,6 @@ namespace boost {
             const Range2T& Test,
             PredicateT Comp)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
-
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<Range1T>::type Iterator1T;
             typedef BOOST_STRING_TYPENAME boost::detail::
@@ -151,10 +142,10 @@ namespace boost {
 
             return detail::
                 ends_with_iter_select( 
-                    begin(lit_input), 
-                    end(lit_input), 
-                    begin(lit_test), 
-                    end(lit_test), 
+                    begin(Input), 
+                    end(Input), 
+                    begin(Test), 
+                    end(Test), 
                     Comp,
                     category());
         }
@@ -215,17 +206,14 @@ namespace boost {
             const Range2T& Test,
             PredicateT Comp)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
-
-            if (empty(lit_test))
+            if (empty(Test))
             {
                 // Empty range is contained always
                 return true;
             }
             
             // Use the temporary variable to make VACPP happy
-            bool bResult=(first_finder(lit_test,Comp)(begin(lit_input), end(lit_input)));
+            bool bResult=(first_finder(Test,Comp)(begin(Input), end(Input)));
             return bResult;
         }
 
@@ -286,19 +274,16 @@ namespace boost {
             const Range2T& Test,
             PredicateT Comp)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
-
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<Range1T>::type Iterator1T;
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<Range2T>::type Iterator2T;
                 
-            Iterator1T InputEnd=end(lit_input);
-            Iterator2T TestEnd=end(lit_test);
+            Iterator1T InputEnd=end(Input);
+            Iterator2T TestEnd=end(Test);
 
-            Iterator1T it=begin(lit_input);
-            Iterator2T pit=begin(lit_test);
+            Iterator1T it=begin(Input);
+            Iterator2T pit=begin(Test);
             for(;
                 it!=InputEnd && pit!=TestEnd;
                 ++it,++pit)
@@ -322,7 +307,7 @@ namespace boost {
             return equals(Input, Test, is_equal());
         }
 
-        //! 'Equals' predicate ( case insensitive )
+        //! 'Equals' predicate ( casa insensitive )
         /*!
             This predicate holds when the test container is equal to the
             input container i.e. all elements in both containers are same.
@@ -346,81 +331,6 @@ namespace boost {
             return equals(Input, Test, is_iequal(Loc));
         }
 
-// lexicographical_compare predicate -----------------------------//
-
-        //! Lexicographical compare predicate
-        /*!
-             This predicate is an overload of std::lexicographical_compare
-             for range arguments
-
-             It check whether the first argument is lexicographically less
-             then the second one.
-
-             If the optional predicate is specified, it is used for character-wise
-             comparison
-
-             \param Arg1 First argument 
-             \param Arg2 Second argument
-             \param Pred Comparison predicate
-             \return The result of the test
-
-             \note This function provides the strong exception-safety guarantee
-         */
-        template<typename Range1T, typename Range2T, typename PredicateT>
-        inline bool lexicographical_compare(
-            const Range1T& Arg1,
-            const Range2T& Arg2,
-            PredicateT Pred)
-        {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_arg1(as_literal(Arg1));
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_arg2(as_literal(Arg2));
-
-            return std::lexicographical_compare(
-                begin(lit_arg1),
-                end(lit_arg1),
-                begin(lit_arg2),
-                end(lit_arg2),
-                Pred);
-        }
-
-        //! Lexicographical compare predicate
-        /*!
-            \overload
-         */
-        template<typename Range1T, typename Range2T>
-            inline bool lexicographical_compare(
-            const Range1T& Arg1,
-            const Range2T& Arg2)
-        {
-            return lexicographical_compare(Arg1, Arg2, is_less());
-        }
-
-        //! Lexicographical compare predicate (case-insensitive)
-        /*!
-            This predicate is an overload of std::lexicographical_compare
-            for range arguments.
-            It check whether the first argument is lexicographically less
-            then the second one.
-            Elements are compared case insensitively
-
-
-             \param Arg1 First argument 
-             \param Arg2 Second argument
-             \param Loc A locale used for case insensitive comparison
-             \return The result of the test
-
-             \note This function provides the strong exception-safety guarantee
-         */
-        template<typename Range1T, typename Range2T>
-        inline bool ilexicographical_compare(
-            const Range1T& Arg1,
-            const Range2T& Arg2,
-            const std::locale& Loc=std::locale())
-        {
-            return lexicographical_compare(Arg1, Arg2, is_iless(Loc));
-        }
-        
-
 //  all predicate  -----------------------------------------------//
 
         //! 'All' predicate
@@ -439,13 +349,11 @@ namespace boost {
             const RangeT& Input, 
             PredicateT Pred)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             typedef BOOST_STRING_TYPENAME 
                 range_const_iterator<RangeT>::type Iterator1T;
 
-            Iterator1T InputEnd=end(lit_input);
-            for( Iterator1T It=begin(lit_input); It!=InputEnd; ++It)
+            Iterator1T InputEnd=end(Input);
+            for( Iterator1T It=begin(Input); It!=InputEnd; ++It)
             {
                 if (!Pred(*It))
                     return false;
@@ -466,8 +374,6 @@ namespace boost {
     using algorithm::equals;
     using algorithm::iequals;
     using algorithm::all;
-    using algorithm::lexicographical_compare;
-    using algorithm::ilexicographical_compare;
 
 } // namespace boost
 

include/boost/algorithm/string/predicate_facade.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library predicate_facade.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_PREDICATE_FACADE_HPP
 #define BOOST_STRING_PREDICATE_FACADE_HPP

include/boost/algorithm/string/regex.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library regex.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_REGEX_HPP
 #define BOOST_STRING_REGEX_HPP
@@ -18,7 +17,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/result_iterator.hpp>
-#include <boost/range/as_literal.hpp>
 
 #include <boost/algorithm/string/find_format.hpp>
 #include <boost/algorithm/string/regex_find_format.hpp>
@@ -60,10 +58,8 @@ namespace boost {
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
-            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
-
             return regex_finder(Rx,Flags)(
-                begin(lit_input), end(lit_input) );
+                begin(Input), end(Input) );
         }
 
 //  replace_regex --------------------------------------------------------------------//
@@ -478,147 +474,6 @@ namespace boost {
                 regex_finder(Rx,Flags) );         
         }
 
-//  join_if ------------------------------------------------------------------//
-
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
-        //! Conditional join algorithm
-        /*!
-            This algorithm joins all strings in a 'list' into one long string.
-            Segments are concatenated by given separator. Only segments that
-            match the given regular expression will be added to the result
-
-            This is a specialization of join_if algorithm.
-
-            \param Input A container that holds the input strings. It must be a container-of-containers.
-            \param Separator A string that will separate the joined segments.
-            \param Rx A regular expression
-            \param Flags Regex options
-            \return Concatenated string.
-
-            \note This function provides the strong exception-safety guarantee
-        */
-        template< 
-            typename SequenceSequenceT, 
-            typename Range1T,             
-            typename CharT, 
-            typename RegexTraitsT >
-        inline typename range_value<SequenceSequenceT>::type 
-        join_if(
-            const SequenceSequenceT& Input,
-            const Range1T& Separator,
-            const basic_regex<CharT, RegexTraitsT>& Rx,
-            match_flag_type Flags=match_default )
-        {
-            // Define working types
-            typedef typename range_value<SequenceSequenceT>::type ResultT;
-            typedef typename range_const_iterator<SequenceSequenceT>::type InputIteratorT;
-
-            // Parse input
-            InputIteratorT itBegin=begin(Input);
-            InputIteratorT itEnd=end(Input);
-
-            // Construct container to hold the result
-            ResultT Result;
-
-
-            // Roll to the first element that will be added
-            while(
-                itBegin!=itEnd && 
-                !regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) ++itBegin;
-
-            // Add this element
-            if(itBegin!=itEnd)
-            {
-                detail::insert(Result, end(Result), *itBegin);
-                ++itBegin;
-            }
-
-            for(;itBegin!=itEnd; ++itBegin)
-            {
-                if(regex_match(begin(*itBegin), end(*itBegin), Rx, Flags))
-                {
-                    // Add separator
-                    detail::insert(Result, end(Result), as_literal(Separator));
-                    // Add element
-                    detail::insert(Result, end(Result), *itBegin);
-                }
-            }
-
-            return Result;
-        }
-
-#else  // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
-                //! Conditional join algorithm
-        /*!
-            This algorithm joins all strings in a 'list' into one long string.
-            Segments are concatenated by given separator. Only segments that
-            match the given regular expression will be added to the result
-
-            This is a specialization of join_if algorithm.
-
-            \param Input A container that holds the input strings. It must be a container-of-containers.
-            \param Separator A string that will separate the joined segments.
-            \param Rx A regular expression
-            \param Flags Regex options
-            \return Concatenated string.
-
-            \note This function provides the strong exception-safety guarantee
-        */
-        template< 
-            typename SequenceSequenceT, 
-            typename Range1T,             
-            typename CharT, 
-            typename RegexTraitsT >
-        inline typename range_value<SequenceSequenceT>::type 
-        join_if_regex(
-            const SequenceSequenceT& Input,
-            const Range1T& Separator,
-            const basic_regex<CharT, RegexTraitsT>& Rx,
-            match_flag_type Flags=match_default )
-        {
-            // Define working types
-            typedef typename range_value<SequenceSequenceT>::type ResultT;
-            typedef typename range_const_iterator<SequenceSequenceT>::type InputIteratorT;
-
-            // Parse input
-            InputIteratorT itBegin=begin(Input);
-            InputIteratorT itEnd=end(Input);
-
-            // Construct container to hold the result
-            ResultT Result;
-
-
-            // Roll to the first element that will be added
-            while(
-                itBegin!=itEnd && 
-                !regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) ++itBegin;
-
-            // Add this element
-            if(itBegin!=itEnd)
-            {
-                detail::insert(Result, end(Result), *itBegin);
-                ++itBegin;
-            }
-
-            for(;itBegin!=itEnd; ++itBegin)
-            {
-                if(regex_match(begin(*itBegin), end(*itBegin), Rx, Flags))
-                {
-                    // Add separator
-                    detail::insert(Result, end(Result), as_literal(Separator));
-                    // Add element
-                    detail::insert(Result, end(Result), *itBegin);
-                }
-            }
-
-            return Result;
-        }
-
-
-#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
     } // namespace algorithm
 
     // pull names into the boost namespace

include/boost/algorithm/string/regex_find_format.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library regex_find_format.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_REGEX_FIND_FORMAT_HPP
 #define BOOST_STRING_REGEX_FIND_FORMAT_HPP

include/boost/algorithm/string/replace.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library replace.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_REPLACE_HPP
 #define BOOST_STRING_REPLACE_HPP
@@ -429,7 +428,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Format A substitute string
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input
@@ -445,7 +443,7 @@ namespace boost {
             OutputIteratorT Output,
             const Range1T& Input,
             const Range2T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range3T& Format )
         {
             return find_format_copy(
@@ -463,7 +461,7 @@ namespace boost {
         inline SequenceT replace_nth_copy( 
             const SequenceT& Input,
             const Range1T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range2T& Format )
         {
             return find_format_copy( 
@@ -480,14 +478,13 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Format A substitute string
         */
         template<typename SequenceT, typename Range1T, typename Range2T>
         inline void replace_nth( 
             SequenceT& Input,
             const Range1T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range2T& Format )
         {
             find_format( 
@@ -510,7 +507,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Format A substitute string
             \param Loc A locale used for case insensitive comparison
             \return An output iterator pointing just after the last inserted character or
@@ -527,7 +523,7 @@ namespace boost {
             OutputIteratorT Output,
             const Range1T& Input,
             const Range2T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range3T& Format,
             const std::locale& Loc=std::locale() )
         {
@@ -546,7 +542,7 @@ namespace boost {
         inline SequenceT ireplace_nth_copy( 
             const SequenceT& Input,
             const Range1T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
@@ -565,7 +561,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for 
             \param Nth An index of the match to be replaced. The index is 0-based.
-                For negative N, matches are counted from the end of string.
             \param Format A substitute string
             \param Loc A locale used for case insensitive comparison
         */
@@ -573,7 +568,7 @@ namespace boost {
         inline void ireplace_nth( 
             SequenceT& Input,
             const Range1T& Search,
-            int Nth,
+            unsigned int Nth,
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
@@ -750,9 +745,7 @@ namespace boost {
             
             \param Output An output iterator to which the result will be copied
             \param Input An input string
-            \param N Length of the head.
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the head
             \param Format A substitute string
             \return An output iterator pointing just after the last inserted character or
                 a modified copy of the input  
@@ -766,7 +759,7 @@ namespace boost {
         inline OutputIteratorT replace_head_copy(
             OutputIteratorT Output,
             const Range1T& Input,
-            int N,
+            unsigned int N,
             const Range2T& Format )
         {
             return find_format_copy(
@@ -783,7 +776,7 @@ namespace boost {
         template<typename SequenceT, typename RangeT>
         inline SequenceT replace_head_copy( 
             const SequenceT& Input,
-            int N,
+            unsigned int N,
             const RangeT& Format )
         {
             return find_format_copy( 
@@ -800,15 +793,13 @@ namespace boost {
             considered to be the head. The input sequence is modified in-place.
 
             \param Input An input string
-            \param N Length of the head.
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the head
             \param Format A substitute string
         */
         template<typename SequenceT, typename RangeT>
         inline void replace_head( 
             SequenceT& Input,
-            int N,
+            unsigned int N,
             const RangeT& Format )
         {
             find_format( 
@@ -830,9 +821,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input string
-            \param N Length of the tail.
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the tail
             \param Format A substitute string
             \return An output iterator pointing just after the last inserted character or
                     a modified copy of the input   
@@ -846,7 +835,7 @@ namespace boost {
         inline OutputIteratorT replace_tail_copy(
             OutputIteratorT Output,
             const Range1T& Input,
-            int N,
+            unsigned int N,
             const Range2T& Format )
         {
             return find_format_copy(
@@ -863,7 +852,7 @@ namespace boost {
         template<typename SequenceT, typename RangeT>
         inline SequenceT replace_tail_copy( 
             const SequenceT& Input,
-            int N,
+            unsigned int N,
             const RangeT& Format )
         {
             return find_format_copy( 
@@ -880,15 +869,13 @@ namespace boost {
             considered to be the tail. The input sequence is modified in-place.
 
             \param Input An input string
-            \param N Length of the tail.
-                For N>=0, at most N characters are extracted.
-                For N<0, size(Input)-|N| characters are extracted.
+            \param N Length of the tail
             \param Format A substitute string
         */
         template<typename SequenceT, typename RangeT>
         inline void replace_tail( 
             SequenceT& Input,
-            int N,
+            unsigned int N,
             const RangeT& Format )
         {
             find_format( 

include/boost/algorithm/string/sequence_traits.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library sequence_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_SEQUENCE_TRAITS_HPP
 #define BOOST_STRING_SEQUENCE_TRAITS_HPP

include/boost/algorithm/string/split.hpp

@@ -1,12 +1,11 @@
-//  Boost string_algo library split.hpp header file  ---------------------------//
+//  Boost string_algo library find.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2006.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_SPLIT_HPP
 #define BOOST_STRING_SPLIT_HPP
@@ -56,7 +55,7 @@ namespace boost {
 
             \note Prior content of the result will be overwritten.
 
-            \note This function provides the strong exception-safety guarantee
+               \note This function provides the strong exception-safety guarantee
         */
         template< typename SequenceSequenceT, typename Range1T, typename Range2T >
         inline SequenceSequenceT& find_all(
@@ -91,7 +90,7 @@ namespace boost {
 
             \note Prior content of the result will be overwritten.
 
-            \note This function provides the strong exception-safety guarantee
+              \note This function provides the strong exception-safety guarantee
         */
         template< typename SequenceSequenceT, typename Range1T, typename Range2T >
         inline SequenceSequenceT& ifind_all(

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

@@ -1,12 +1,11 @@
 //  Boost string_algo library list_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_STD_LIST_TRAITS_HPP
 #define BOOST_STRING_STD_LIST_TRAITS_HPP

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

@@ -1,12 +1,11 @@
 //  Boost string_algo library string_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_STD_ROPE_TRAITS_HPP
 #define BOOST_STRING_STD_ROPE_TRAITS_HPP

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

@@ -1,19 +1,18 @@
 //  Boost string_algo library slist_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003. 
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_STD_SLIST_TRAITS_HPP
 #define BOOST_STRING_STD_SLIST_TRAITS_HPP
 
 #include <boost/algorithm/string/config.hpp>
 #include <boost/algorithm/string/yes_no_type.hpp>
-#include BOOST_SLIST_HEADER 
+#include <slist>
 #include <boost/algorithm/string/sequence_traits.hpp>
 
 namespace boost {

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

@@ -1,12 +1,11 @@
 //  Boost string_algo library string_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_STD_STRING_TRAITS_HPP
 #define BOOST_STRING_STD_STRING_TRAITS_HPP

include/boost/algorithm/string/std_containers_traits.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library std_containers_traits.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_STD_CONTAINERS_TRAITS_HPP
 #define BOOST_STRING_STD_CONTAINERS_TRAITS_HPP

include/boost/algorithm/string/trim.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library trim.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_TRIM_HPP
 #define BOOST_STRING_TRIM_HPP
@@ -16,8 +15,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/const_iterator.hpp>
-#include <boost/range/as_literal.hpp>
-#include <boost/range/iterator_range.hpp>
 
 #include <boost/algorithm/string/detail/trim.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -63,14 +60,12 @@ namespace boost {
             const RangeT& Input,
             PredicateT IsSpace)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
-
             std::copy( 
                 ::boost::algorithm::detail::trim_begin( 
-                    begin(lit_range), 
-                    end(lit_range), 
+                    begin(Input), 
+                    end(Input), 
                     IsSpace ),
-                end(lit_range),
+                end(Input),
                 Output);
 
             return Output;
@@ -171,13 +166,11 @@ namespace boost {
             const RangeT& Input,
             PredicateT IsSpace )
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
-         
             std::copy( 
-                begin(lit_range),
+                begin(Input),
                 ::boost::algorithm::detail::trim_end( 
-                    begin(lit_range), 
-                    end(lit_range), 
+                    begin(Input), 
+                    end(Input), 
                     IsSpace ),
                 Output );
 
@@ -283,18 +276,16 @@ namespace boost {
             const RangeT& Input,
             PredicateT IsSpace)
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
-
             BOOST_STRING_TYPENAME 
                 range_const_iterator<RangeT>::type TrimEnd=
                 ::boost::algorithm::detail::trim_end( 
-                    begin(lit_range), 
-                    end(lit_range), 
+                    begin(Input), 
+                    end(Input), 
                     IsSpace);
 
             std::copy( 
                 detail::trim_begin( 
-                    begin(lit_range), TrimEnd, IsSpace),
+                    begin(Input), TrimEnd, IsSpace),
                 TrimEnd,
                 Output
                 );

include/boost/algorithm/string/yes_no_type.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library yes_no_type.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2003.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2003. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_YES_NO_TYPE_DETAIL_HPP
 #define BOOST_STRING_YES_NO_TYPE_DETAIL_HPP

include/boost/algorithm/string_regex.hpp

@@ -1,12 +1,11 @@
 //  Boost string_algo library string_regex.hpp header file  ---------------------------//
 
-//  Copyright Pavol Droba 2002-2004.
-//
-// 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)
+//  Copyright Pavol Droba 2002-2004. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/ for updates, documentation, and revision history.
+//  See http://www.boost.org for updates, documentation, and revision history.
 
 #ifndef BOOST_STRING_ALGO_REGEX_HPP
 #define BOOST_STRING_ALGO_REGEX_HPP

minmax/example/Jamfile

@@ -7,6 +7,8 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 #
 
+subproject libs/algorithm/minmax/example ;
+
 exe minmax_ex : minmax_ex.cpp ;
 exe minmax_timer : minmax_timer.cpp ;
 

minmax/index.html

@@ -350,7 +350,8 @@ 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="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
+<a href="http://www.cuj.com/experts/1904/alexandr.htm?topic=experts&topic=experts">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

minmax/test/Jamfile

@@ -0,0 +1,33 @@
+# Boost.Minmax Library Test Jamfile
+#
+# Copyright (C) 2002--2004, Herve Bronnimann
+#
+# Use, modification, and distribution is subject to the Boost Software
+# License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#
+
+subproject libs/algorithm/minmax/test ;
+
+# bring in rules for testing
+import testing ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+  test-suite algorithm/minmax
+        : [ run
+                minmax_element_test.cpp
+              : :
+                :
+                : minmax_element
+            ]
+          [ run
+                minmax_test.cpp
+              : :
+                :
+                : minmax
+            ]
+  ;
+}

string/doc/Jamfile.v2

@@ -10,7 +10,7 @@
 import toolset ;
 toolset.using doxygen ;
 
-boostbook string_algo : string_algo.xml autodoc ;
+boostbook string_algo : string_algo.xml ;
 
 doxygen autodoc
     :   
@@ -32,7 +32,6 @@ doxygen autodoc
     [ glob ../../../../boost/algorithm/string/predicate.hpp ]
     [ glob ../../../../boost/algorithm/string/split.hpp ]
     [ glob ../../../../boost/algorithm/string/erase.hpp ]
-    [ glob ../../../../boost/algorithm/string/join.hpp ]
     [ glob ../../../../boost/algorithm/string/replace.hpp ]
     [ glob ../../../../boost/algorithm/string/find_format.hpp ]
     [ glob ../../../../boost/algorithm/string/formatter.hpp ]

string/doc/concept.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.concept" last-revision="$Date$">
     <title>Concepts</title>
 

string/doc/credits.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.credits" last-revision="$Date$">
     <title>Credits</title>
     <section id="string_algo.ack">

string/doc/design.xml

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.design" last-revision="$Date$">
     <title>Design Topics</title>
 

string/doc/environment.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.env" last-revision="$Date$">
     <title>Environment</title>
     <section>

string/doc/intro.xml

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.intro" last-revision="$Date$">
     <title>Introduction</title>
 

string/doc/quickref.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.quickref" last-revision="$Date$">
     <title>Quick Reference</title>
 
@@ -149,16 +143,6 @@
                             <functionname>iequals()</functionname>
                         </entry>
                     </row>
-                    <row>
-                        <entry><code>lexicographical_compare</code></entry>
-                        <entry>Check if a string is lexicographicaly less then another one</entry>
-                        <entry>
-                            <functionname>lexicographical_compare()</functionname>
-                            <sbr/>
-                            <functionname>ilexicographical_compare()</functionname>
-                        </entry>
-                    </row>
-
                     <row>
                         <entry><code>all</code></entry>
                         <entry>Check if all elements of a string satisfy the given predicate</entry>
@@ -446,34 +430,6 @@
                 </tbody>
             </tgroup>
         </table>
-        <table>
-            <title>Join</title>
-            <tgroup cols="3" align="left">
-                <thead>
-                    <row>
-                        <entry>Algorithm name</entry>
-                        <entry>Description</entry>
-                        <entry>Functions</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>join</entry>
-                        <entry>Join all elements in a container into a single string</entry>
-                        <entry>
-                            <functionname>join</functionname>
-                        </entry>
-                    </row>
-                        <row>
-                        <entry>join_if</entry>
-                        <entry>Join all elements in a container that satisfies the condition into a single string</entry>
-                        <entry>
-                            <functionname>join_if()</functionname>
-                        </entry>
-                   </row>
-                </tbody>
-            </tgroup>
-        </table>
     </section>
     <section>
         <title>Finders and Formatters</title>

string/doc/rationale.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.rationale" last-revision="$Date$">
     <title>Rationale</title>
 

string/doc/release_notes.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <section id="string_algo.release_notes" last-revision="$Date$">
     <title>Release Notes</title>
 

string/doc/string_algo.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
 <library name="String Algorithms" dirname="algorithm/string" xmlns:xi="http://www.w3.org/2001/XInclude" 
     id="string_algo" last-revision="$Date$">
     <libraryinfo>
@@ -44,7 +38,7 @@
     <xi:include href="quickref.xml"/>
     <xi:include href="design.xml"/>
     <xi:include href="concept.xml"/>
-    <xi:include href="autodoc.xml"/>
+    <xi:include href="autodoc.boostbook"/>
     <xi:include href="rationale.xml"/>
     <xi:include href="environment.xml"/>
     <xi:include href="credits.xml"/>

string/doc/usage.xml

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
 "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-
-
-<!-- Copyright (c) 2002-2006 Pavol Droba.
-     Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
--->
-
-
 <section id="string_algo.usage" last-revision="$Date$">
     <title>Usage</title>
 
@@ -291,9 +283,9 @@
     // aBC
     
     typedef split_iterator&lt;string::iterator&gt; string_split_iterator;
-    for(string_split_iterator It=
+    for(string_find_iterator It=
         make_split_iterator(str1, first_finder("-*-", is_iequal()));
-        It!=string_split_iterator();
+        It!=string_find_iterator();
         ++It)
     {
         cout &lt;&lt; copy_range&lt;std::string&gt;(*It) &lt;&lt; endl;

string/example/Jamfile

@@ -7,12 +7,69 @@
 #
 #  See http://www.boost.org for updates, documentation, and revision history.
 
+subproject libs/algorithm/string/example ;
 
-exe conv_example : conv_example.cpp ;
-exe predicate_example : predicate_example.cpp ;
-exe find_example : find_example.cpp ;
-exe replace_example : replace_example.cpp ;
-exe rle_example : rle_example.cpp ;
-exe trim_example : trim_example.cpp ;
-exe regex_example : regex_example.cpp /boost/regex//boost_regex ;
-exe split_example : split_example.cpp ;
+exe conv_example
+    :
+    conv_example.cpp
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe predicate_example
+    :
+    predicate_example.cpp
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe find_example
+    :
+    find_example.cpp 
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe replace_example
+    :
+    replace_example.cpp
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe rle_example
+    :
+    rle_example.cpp
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe trim_example
+    :
+    trim_example.cpp
+    :
+    <include>$(BOOST_ROOT)
+    :
+    ;
+
+exe regex_example
+    :
+    regex_example.cpp
+    <lib>../../../regex/build/boost_regex
+    :
+    <include>$(BOOST_ROOT)     
+    :
+    ;
+
+exe split_example
+    :
+    split_example.cpp
+    :
+    <include>$(BOOST_ROOT)
+    :
+    ;

string/index.html

@@ -4,11 +4,6 @@
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="../../../doc/html/string_algo.html">../../doc/html/string_algo.html</a> 
-&nbsp;<hr>
-<p><EFBFBD> Copyright Beman Dawes, 2001</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>
+<a href="../../../doc/html/string_algo.html">../../doc/html/string_algo.html</a>
 </body>
-</html>
+</html>

string/test/Jamfile

@@ -0,0 +1,77 @@
+#  Boost string_algo library test suite Jamfile  ----------------------------
+#
+#  Copyright Pavol Droba 2002-2003. Use, modification and
+#  distribution is subject to the Boost Software License, Version
+#  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+#  http://www.boost.org/LICENSE_1_0.txt)
+#
+#  See http://www.boost.org for updates, documentation, and revision history.
+
+subproject libs/algorithm/string/test ;
+
+# bring in rules for testing
+import testing ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+    test-suite algorithm/string
+        : [ run 
+                trim_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : trim
+            ]
+          [ run 
+                conv_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : conv
+            ]
+          [ run 
+                predicate_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : predicate
+            ]
+          [ run 
+                find_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : find
+            ]
+          [ run
+                split_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : split
+            ]
+          [ run 
+                replace_test.cpp
+              : :
+                :
+                std::locale-support
+                std::facet-support
+                : replace
+            ]
+          [ run 
+                regex_test.cpp
+                <lib>../../../regex/build/boost_regex
+              : :
+                :   
+                : regex
+            ]
+        ;
+}
+

string/test/Jamfile.v2

@@ -40,12 +40,6 @@ test-suite algorithm/string
             :
             : split
         ]
-      [ run
-            join_test.cpp
-          : :
-            :
-            : join
-        ]
       [ run 
             replace_test.cpp
           : :

string/test/find_test.cpp

@@ -93,33 +93,16 @@ void find_test()
         ( (nc_result.begin()-str1.begin()) == 9) &&
         ( (nc_result.end()-str1.begin()) == 12) );
 
-    nc_result=find_nth( str1, string("abc"), -1 );
-    BOOST_CHECK( 
-        ( (nc_result.begin()-str1.begin()) == 15) &&
-        ( (nc_result.end()-str1.begin()) == 18) );
-
-
     cv_result=find_nth( const_cast<const string&>(str1), str2, 1 );
     BOOST_CHECK( 
         ( (cv_result.begin()-str1.begin()) == 9) &&
         ( (cv_result.end()-str1.begin()) == 12) );
-
-    cv_result=find_nth( const_cast<const string&>(str1), str2, -1 );
-    BOOST_CHECK( 
-        ( (cv_result.begin()-str1.begin()) == 15) &&
-        ( (cv_result.end()-str1.begin()) == 18) );
         
     cv_result=ifind_nth( const_cast<const string&>(str1), "xxx", 1 );
     BOOST_CHECK( 
         ( (cv_result.begin()-str1.begin()) == 12) &&
         ( (cv_result.end()-str1.begin()) == 15) );
 
-    cv_result=ifind_nth( const_cast<const string&>(str1), "xxx", 1 );
-    BOOST_CHECK( 
-        ( (cv_result.begin()-str1.begin()) == 12) &&
-        ( (cv_result.end()-str1.begin()) == 15) );
-
-
     ch_result=find_nth( pch1, "abc", 1 );
     BOOST_CHECK(( (ch_result.begin() - pch1 ) == 9) && ( (ch_result.end() - pch1 ) == 12 ) );
 
@@ -131,11 +114,6 @@ void find_test()
         ( (nc_result.begin()-str1.begin()) == 0) &&
         ( (nc_result.end()-str1.begin()) == 6) );
 
-    nc_result=find_head( str1, -6 );
-    BOOST_CHECK( 
-        ( (nc_result.begin()-str1.begin()) == 0) &&
-        ( (str1.end()-nc_result.end()) == 6 ) );
-
     cv_result=find_head( const_cast<const string&>(str1), 6 );
     BOOST_CHECK( 
         ( (cv_result.begin()-str1.begin()) == 0) &&
@@ -152,12 +130,6 @@ void find_test()
         ( (nc_result.begin()-str1.begin()) == 15) &&
         ( (nc_result.end()-str1.begin()) == 21) );
 
-    nc_result=find_tail( str1, -6 );
-    BOOST_CHECK( 
-        ( (nc_result.begin()-str1.begin()) == 6) &&
-        ( (nc_result.end()-str1.begin()) == 21) );
-
-
     cv_result=find_tail( const_cast<const string&>(str1), 6 );
     BOOST_CHECK( 
         ( (cv_result.begin()-str1.begin()) == 15) &&

string/test/join_test.cpp

@@ -1,79 +0,0 @@
-//  Boost string_algo library iterator_test.cpp file  ---------------------------//
-
-//  Copyright Pavol Droba 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/classification.hpp>
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
-
-// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
-
-#include <string>
-#include <vector>
-#include <iostream>
-
-#include <boost/test/test_tools.hpp>
-
-
-using namespace std;
-using namespace boost;
-
-bool is_not_empty(const std::string& str)
-{
-    return !str.empty();
-}
-
-void join_test()
-{
-    // Prepare inputs
-    vector<string> tokens1;
-    tokens1.push_back("xx");
-    tokens1.push_back("abc");
-    tokens1.push_back("xx");
-
-    vector<string> tokens2;
-    tokens2.push_back("");
-    tokens2.push_back("xx");
-    tokens2.push_back("abc");
-    tokens2.push_back("");
-    tokens2.push_back("abc");
-    tokens2.push_back("xx");
-    tokens2.push_back("");
-
-    vector<string> tokens3;
-    tokens3.push_back("");
-    tokens3.push_back("");
-    tokens3.push_back("");
-
-    vector<string> empty_tokens;
-
-    vector<vector<int> > vtokens;
-    for(unsigned int n=0; n<tokens2.size(); ++n)
-    {
-        vtokens.push_back(vector<int>(tokens2[n].begin(), tokens2[n].end()));
-    }
-
-    BOOST_CHECK( equals(join(tokens1, "-"), "xx-abc-xx") );
-    BOOST_CHECK( equals(join(tokens2, "-"), "-xx-abc--abc-xx-") );
-    BOOST_CHECK( equals(join(vtokens, "-"), "-xx-abc--abc-xx-") );
-    BOOST_CHECK( equals(join(empty_tokens, "-"), "") );
-
-    BOOST_CHECK( equals(join_if(tokens2, "-", is_not_empty), "xx-abc-abc-xx") );
-    BOOST_CHECK( equals(join_if(empty_tokens, "-", is_not_empty), "") );
-    BOOST_CHECK( equals(join_if(tokens3, "-", is_not_empty), "") );
-}
-
-// test main 
-int test_main( int, char*[] )
-{
-    join_test();
-    
-    return 0;
-}

string/test/predicate_test.cpp

@@ -56,14 +56,6 @@ void predicate_test()
     BOOST_CHECK( iequals( "AbC", "abc" ) );
     BOOST_CHECK( !iequals( "aBc", "yyy" ) );
 
-    BOOST_CHECK( lexicographical_compare("abc", "abd") );
-    BOOST_CHECK( !lexicographical_compare("abc", "abc") );
-    BOOST_CHECK( lexicographical_compare("abc", "abd", is_less()) );
-
-    BOOST_CHECK( !ilexicographical_compare("aBD", "AbC") );
-    BOOST_CHECK( ilexicographical_compare("aBc", "AbD") );
-    BOOST_CHECK( lexicographical_compare("abC", "aBd", is_iless()) );
-
     // multi-type comparison test
     BOOST_CHECK( starts_with( vec1, string("123") ) );
     BOOST_CHECK( ends_with( vec1, string("321") ) );
@@ -93,7 +85,6 @@ void predicate_test()
     BOOST_CHECK( ends_with( "123xxx321", "321" ) );
     BOOST_CHECK( contains( "123xxx321", "xxx" ) );
     BOOST_CHECK( equals( "123xxx321", "123xxx321" ) );
-
 }
 
 #define TEST_CLASS( Pred, YesInput, NoInput )\

string/test/regex_test.cpp

@@ -8,11 +8,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <boost/algorithm/string/regex.hpp>
-#include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/sequence_traits.hpp>
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
-
 
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
@@ -87,23 +83,6 @@ static void find_test()
 
 }
 
-static void join_test()
-{
-    // Prepare inputs
-    vector<string> tokens1;
-    tokens1.push_back("xx");
-    tokens1.push_back("abc");
-    tokens1.push_back("xx");
-
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-    BOOST_CHECK( equals(join_if(tokens1, "-", regex("x+")), "xx-xx") );
-    BOOST_CHECK( equals(join_if(tokens1, "-", regex("[abc]+")), "abc") );
-#else 
-    BOOST_CHECK( equals(join_if_regex(tokens1, "-", regex("x+")), "xx-xx") );
-    BOOST_CHECK( equals(join_if_regex(tokens1, "-", regex("[abc]+")), "abc") );
-#endif 
-}
-
 static void replace_test()
 {
     string str1("123a1cxxxa23cXXXa456c321");
@@ -152,7 +131,6 @@ static void replace_test()
 int test_main( int, char*[] )
 {
     find_test();
-    join_test();
     replace_test();
 
     return 0;

string/test/replace_test.cpp

@@ -136,27 +136,17 @@ void replace_nth_test()
 {
     // replace nth
     TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ 0 C_ string("YYY"), string("1YYY3abc2") );
-    TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ -1 C_ string("YYY"), string("1abc3YYY2") );
     TEST_ALGO( ireplace_nth, "1AbC3abc2", "aBc" C_ 0 C_ "YYY", string("1YYY3abc2") );
-    TEST_ALGO( ireplace_nth, "1AbC3abc2", "aBc" C_ -1 C_ "YYY", string("1AbC3YYY2") );
     TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ 0 C_ string("Z"), string("1Z3abc2") );
     TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ 0 C_ string("XXXX"), string("1XXXX3abc2") );
     TEST_ALGO( replace_nth, "1abc3abc2", "abc" C_ 0 C_ "XXXX", string("1XXXX3abc2") );
-    TEST_ALGO( replace_nth, "1abc3abc2", "abc" C_ 3 C_ "XXXX", string("1abc3abc2") );
-    TEST_ALGO( replace_nth, "1abc3abc2", "abc" C_ -3 C_ "XXXX", string("1abc3abc2") );
     TEST_ALGO( replace_nth, "1abc3abc2", string("") C_ 0 C_ string("XXXX"), string("1abc3abc2") );
     TEST_ALGO( replace_nth, "", string("") C_ 0 C_ string("XXXX"), string("") );
-    TEST_ALGO( replace_nth, "", string("") C_ -1 C_ string("XXXX"), string("") );
     TEST_ALGO( erase_nth, "1abc3abc2", string("abc") C_ 0, string("13abc2") );
-    TEST_ALGO( erase_nth, "1abc3abc2", string("abc") C_ -1, string("1abc32") );
-    TEST_ALGO( erase_nth, "1abc3abc2", string("abc") C_ -3, string("1abc3abc2") );
     TEST_ALGO( ierase_nth, "1aBc3aBc2", "ABC" C_ 0, string("13aBc2") );
-    TEST_ALGO( ierase_nth, "1aBc3aBc2", "ABC" C_ -1, string("1aBc32") );
-    TEST_ALGO( ierase_nth, "1aBc3aBc2", "ABC" C_ -3, string("1aBc3aBc2") );
     TEST_ALGO( erase_nth, "1abc3abc2", "abc" C_ 0, string("13abc2") );
     TEST_ALGO( erase_nth, "1abc3abc2", string("") C_ 0, string("1abc3abc2") );
     TEST_ALGO( erase_nth, "", string("abc") C_ 0, string("") );
-    TEST_ALGO( erase_nth, "", string("abc") C_ -1, string("") );
     TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ 1 C_ string("YYY"), string("1abc3YYY2") );
     TEST_ALGO( replace_nth, "1abc3abc2", string("abc") C_ 2 C_ string("YYY"), string("1abc3abc2") );
 }
@@ -165,37 +155,28 @@ void replace_head_test()
 {
     // replace head
     TEST_ALGO( replace_head, "abc3abc2", 3 C_ string("YYY"), string("YYY3abc2") );
-    TEST_ALGO( replace_head, "abc3abc2", -3 C_ string("YYY"), string("YYYbc2") );
     TEST_ALGO( replace_head, "abc3abc2", 3 C_ "YYY", string("YYY3abc2") );
     TEST_ALGO( replace_head, "abc", 3 C_ string("Z"), string("Z") );
     TEST_ALGO( replace_head, "abc", 6 C_ string("XXXX"), string("XXXX") );
-    TEST_ALGO( replace_head, "abc", -6 C_ string("XXXX"), string("abc") );
     TEST_ALGO( replace_head, "abc3abc2", 0 C_ string("XXXX"), string("abc3abc2") );
     TEST_ALGO( replace_head, "", 4 C_ string("XXXX"), string("") );
-    TEST_ALGO( replace_head, "", -4 C_ string("XXXX"), string("") );
     TEST_ALGO( erase_head, "abc3abc2", 3, string("3abc2") );
-    TEST_ALGO( erase_head, "abc3abc2", -3, string("bc2") );
     TEST_ALGO( erase_head, "abc3abc2", 0, string("abc3abc2") );
     TEST_ALGO( erase_head, "", 4, string("") );
-    TEST_ALGO( erase_head, "", -4, string("") );
 }
 
 void replace_tail_test()
 {
     // replace tail
     TEST_ALGO( replace_tail, "abc3abc", 3 C_ string("YYY"), string("abc3YYY") );
-    TEST_ALGO( replace_tail, "abc3abc", -3 C_ "YYY", string("abcYYY") );
+    TEST_ALGO( replace_tail, "abc3abc", 3 C_ "YYY", string("abc3YYY") );
     TEST_ALGO( replace_tail, "abc", 3 C_ string("Z"), string("Z") );
     TEST_ALGO( replace_tail, "abc", 6 C_ string("XXXX"), string("XXXX") );
-    TEST_ALGO( replace_tail, "abc", -6 C_ string("XXXX"), string("abc") );
     TEST_ALGO( replace_tail, "abc3abc", 0 C_ string("XXXX"), string("abc3abc") );
     TEST_ALGO( replace_tail, "", 4 C_ string("XXXX"), string("") );
-    TEST_ALGO( replace_tail, "", -4 C_ string("XXXX"), string("") );
     TEST_ALGO( erase_tail, "abc3abc", 3, string("abc3") );
-    TEST_ALGO( erase_tail, "abc3abc", -3, string("abc") );
     TEST_ALGO( erase_tail, "abc3abc", 0, string("abc3abc") );
     TEST_ALGO( erase_tail, "", 4, string("") );
-    TEST_ALGO( erase_tail, "", -4, string("") );
 }
 
 void replace_range_test()

string/test/split_test.cpp

@@ -122,25 +122,6 @@ void iterator_test()
     BOOST_CHECK( tokens[2]==string("") );
     BOOST_CHECK( tokens[3]==string("xx") );
     BOOST_CHECK( tokens[4]==string("abb") );
-
-    find_iterator<string::iterator> fiter=make_find_iterator(str1, first_finder("xx"));
-    BOOST_CHECK(equals(*fiter, "xx"));
-    ++fiter;
-    BOOST_CHECK(equals(*fiter, "xx"));
-    ++fiter;
-    BOOST_CHECK(fiter==find_iterator<string::iterator>());
-
-    split_iterator<string::iterator> siter=make_split_iterator(str1, token_finder(is_any_of("-"), token_compress_on));
-    BOOST_CHECK(equals(*siter, "xx"));
-    ++siter;
-    BOOST_CHECK(equals(*siter, "abc"));
-    ++siter;
-    BOOST_CHECK(equals(*siter, "xx"));
-    ++siter;
-    BOOST_CHECK(equals(*siter, "abb"));
-    ++siter;
-    BOOST_CHECK(siter==split_iterator<string::iterator>());
-
 }
 
 // test main