[Boost-commit] svn:boost r59277 - in trunk/boost/spirit/home/support/iterators: . detail

Subject: [Boost-commit] svn:boost r59277 - in trunk/boost/spirit/home/support/iterators: . detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-01-27 12:31:38

Author: hkaiser
Date: 2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
New Revision: 59277
URL: http://svn.boost.org/trac/boost/changeset/59277

Log:
Spirit: replacing custom made swap with boost::swap, should make compile Wave again
Text files modified: 
   trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp        |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp    |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp                 |     9 ---------                               
   trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp     |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/multi_pass.hpp                        |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/multi_pass_fwd.hpp                    |     6 +-----                                  
   7 files changed, 6 insertions(+), 19 deletions(-)

Modified: trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -51,7 +51,7 @@
 
             void swap(unique& x)
             {
-                spirit::detail::swap(buf_id, x.buf_id);
+                boost::swap(buf_id, x.buf_id);
             }
 
             // called to verify that everything is ok.

Modified: trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -45,7 +45,7 @@
 
             void swap(unique& x)
             {
-                spirit::detail::swap(queuePosition, x.queuePosition);
+                boost::swap(queuePosition, x.queuePosition);
             }
 
             //  This is called when the iterator is dereferenced. It's a 

Modified: trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -17,15 +17,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace detail
 {
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename T>
-    inline void swap(T& t1, T& t2)
-    {
-        using std::swap;
-        using boost::spirit::swap;
-        swap(t1, t2);
-    }
-
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
     ///////////////////////////////////////////////////////////////////////////
     //  Meta-function to generate a std::iterator<> base class for multi_pass. 

Modified: trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -126,7 +126,7 @@
 
             void swap(unique& x)
             {
-                spirit::detail::swap(ftor, x.ftor);
+                boost::swap(ftor, x.ftor);
             }
 
         public:

Modified: trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -42,7 +42,7 @@
 
             void swap(unique& x)
             {
-                spirit::detail::swap(queued_position, x.queued_position);
+                boost::swap(queued_position, x.queued_position);
             }
 
             // This is called when the iterator is dereferenced.  It's a 

Modified: trunk/boost/spirit/home/support/iterators/multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/multi_pass.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/multi_pass.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -99,7 +99,7 @@
 
         void swap(multi_pass& x)
         {
-            spirit::detail::swap(this->member, x.member);
+            boost::swap(this->member, x.member);
             this->policies_base_type::swap(x);
         }
 

Modified: trunk/boost/spirit/home/support/iterators/multi_pass_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/multi_pass_fwd.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/multi_pass_fwd.hpp	2010-01-27 12:31:36 EST (Wed, 27 Jan 2010)
@@ -11,6 +11,7 @@
 
 #include <cstddef>
 #include <boost/spirit/home/support/multi_pass_wrapper.hpp>
+#include <boost/swap.hpp>
 
 namespace boost { namespace spirit {
 
@@ -59,11 +60,6 @@
     template <typename T, typename Policies>
     void swap(multi_pass<T, Policies> &x, multi_pass<T, Policies> &y);
 
-    namespace detail 
-    {
-        template <typename T> void swap(T& t1, T& t2);
-    }
-
 }} // namespace boost::spirit
 
 namespace boost { namespace spirit { namespace traits