Update of /cvsroot/boost/boost/boost/algorithm/string/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv418/detail

Modified Files:
        case_conv.hpp find_format.hpp finder.hpp 
Log Message:
adapting to new range interface



Index: case_conv.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/detail/case_conv.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- case_conv.hpp       1 Jul 2007 13:12:57 -0000       1.5
+++ case_conv.hpp       1 Jul 2007 22:23:55 -0000       1.6
@@ -63,46 +63,46 @@
 
 // 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
+            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);
-                       }
+            // 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));
-                       }
+            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

Index: find_format.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/detail/find_format.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- find_format.hpp     27 Jul 2006 10:27:34 -0000      1.4
+++ find_format.hpp     1 Jul 2007 22:23:55 -0000       1.5
@@ -27,20 +27,17 @@
             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) );
@@ -49,14 +46,12 @@
             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 )
@@ -92,18 +87,15 @@
 
             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) );
@@ -111,13 +103,11 @@
 
             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)
@@ -152,18 +142,15 @@
         
             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) );
@@ -171,13 +158,11 @@
 
             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)

Index: finder.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/detail/finder.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- finder.hpp  27 Jul 2006 10:27:34 -0000      1.14
+++ finder.hpp  1 Jul 2007 22:23:55 -0000       1.15
@@ -19,6 +19,7 @@
 #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 {


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to