[Boost-commit] svn:boost r63936 - trunk/boost/range/adaptor

Subject: [Boost-commit] svn:boost r63936 - trunk/boost/range/adaptor
From: neil_at_[hidden]
Date: 2010-07-12 18:02:46

Author: neilgroves
Date: 2010-07-12 18:02:46 EDT (Mon, 12 Jul 2010)
New Revision: 63936
URL: http://svn.boost.org/trac/boost/changeset/63936

Log:
avoid name clash with Boost.Algorithm by renaming replace_range to replaced_range
Text files modified: 
   trunk/boost/range/adaptor/replaced.hpp |    22 +++++++++++-----------                  
   1 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/range/adaptor/replaced.hpp
==============================================================================
--- trunk/boost/range/adaptor/replaced.hpp	(original)
+++ trunk/boost/range/adaptor/replaced.hpp	2010-07-12 18:02:46 EDT (Mon, 12 Jul 2010)
@@ -47,7 +47,7 @@
         };
 
         template< class R >
-        class replace_range :
+        class replaced_range :
             public boost::iterator_range<
                 boost::transform_iterator<
                     replace_value< BOOST_DEDUCED_TYPENAME range_value<R>::type >,
@@ -64,7 +64,7 @@
         public:
             typedef BOOST_DEDUCED_TYPENAME range_value<R>::type value_type;
 
-            replace_range( R& r, value_type from, value_type to )
+            replaced_range( R& r, value_type from, value_type to )
                 : base_t( make_transform_iterator( boost::begin(r), Fn(from, to) ),
                           make_transform_iterator( boost::end(r), Fn(from, to) ) )
             { }
@@ -83,23 +83,23 @@
         };
 
         template< class InputRng >
-        inline replace_range<InputRng>
+        inline replaced_range<InputRng>
         operator|( InputRng& r,
                    const replace_holder<BOOST_DEDUCED_TYPENAME range_value<InputRng>::type>& f )
         {
-            return replace_range<InputRng>(r, f.val1, f.val2);
+            return replaced_range<InputRng>(r, f.val1, f.val2);
         }
 
         template< class InputRng >
-        inline replace_range<const InputRng>
+        inline replaced_range<const InputRng>
         operator|( const InputRng& r,
                    const replace_holder<BOOST_DEDUCED_TYPENAME range_value<InputRng>::type>& f )
         {
-            return replace_range<const InputRng>(r, f.val1, f.val2);
+            return replaced_range<const InputRng>(r, f.val1, f.val2);
         }
     } // 'range_detail'
 
-    using range_detail::replace_range;
+    using range_detail::replaced_range;
 
     namespace adaptors
     {
@@ -111,21 +111,21 @@
         }
 
         template<class InputRange>
-        inline replace_range<InputRange>
+        inline replaced_range<InputRange>
         replace(InputRange& rng,
                 BOOST_DEDUCED_TYPENAME range_value<InputRange>::type from,
                 BOOST_DEDUCED_TYPENAME range_value<InputRange>::type to)
         {
-            return replace_range<InputRange>(rng, from, to);
+            return replaced_range<InputRange>(rng, from, to);
         }
 
         template<class InputRange>
-        inline replace_range<const InputRange>
+        inline replaced_range<const InputRange>
         replace(const InputRange& rng,
                 BOOST_DEDUCED_TYPENAME range_value<const InputRange>::type from,
                 BOOST_DEDUCED_TYPENAME range_value<const InputRange>::type to)
         {
-            return replace_range<const InputRange>(rng, from ,to);
+            return replaced_range<const InputRange>(rng, from ,to);
         }
 
     } // 'adaptors'