merged fusion from the trunk

[SVN r63560]

include/boost/fusion/container/deque/deque.hpp

@@ -68,7 +68,7 @@ namespace boost { namespace fusion {
             {}
 
         template<typename Sequence>
-            deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* dummy = 0)
+            deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* /*dummy*/ = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
 

include/boost/fusion/container/deque/deque_iterator.hpp

@@ -100,6 +100,10 @@ namespace boost { namespace fusion {
         {};
 
         Seq& seq_;
+
+    private:
+        // silence MSVC warning C4512: assignment operator could not be generated
+        deque_iterator& operator= (deque_iterator const&);
     };
 
 }}

include/boost/fusion/container/list/cons.hpp

@@ -46,11 +46,11 @@ namespace boost { namespace fusion
         nil() {}
 
         template <typename Iterator>
-        nil(Iterator const& iter, mpl::true_ /*this_is_an_iterator*/)
+        nil(Iterator const& /*iter*/, mpl::true_ /*this_is_an_iterator*/)
         {}
 
         template <typename Iterator>
-        void assign_from_iter(Iterator const& iter)
+        void assign_from_iter(Iterator const& /*iter*/)
         {
         }
     };
@@ -69,13 +69,13 @@ namespace boost { namespace fusion
         cons()
             : car(), cdr() {}
 
-        explicit cons(typename detail::call_param<Car>::type car)
-            : car(car), cdr() {}
+        explicit cons(typename detail::call_param<Car>::type in_car)
+            : car(in_car), cdr() {}
 
         cons(
-            typename detail::call_param<Car>::type car
-          , typename detail::call_param<Cdr>::type cdr)
-            : car(car), cdr(cdr) {}
+            typename detail::call_param<Car>::type in_car
+          , typename detail::call_param<Cdr>::type in_cdr)
+            : car(in_car), cdr(in_cdr) {}
         
         template <typename Car2, typename Cdr2>
         cons(cons<Car2, Cdr2> const& rhs)
@@ -92,7 +92,7 @@ namespace boost { namespace fusion
                     is_convertible<Sequence, cons> // use copy ctor instead
                   , is_convertible<Sequence, Car>  // use copy to car instead
                 > 
-            >::type* dummy = 0
+            >::type* /*dummy*/ = 0
         )
             : car(*fusion::begin(seq))
             , cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {}

include/boost/fusion/container/list/cons_iterator.hpp

@@ -35,8 +35,8 @@ namespace boost { namespace fusion
             typename add_const<Cons>::type> 
         identity;
 
-        explicit cons_iterator(cons_type& cons)
-            : cons(cons) {}
+        explicit cons_iterator(cons_type& in_cons)
+            : cons(in_cons) {}
 
         cons_type& cons;
 

include/boost/fusion/container/vector/vector.hpp

@@ -111,7 +111,7 @@ namespace boost { namespace fusion
         typename add_reference<
             typename mpl::at<types, I>::type
         >::type
-        at_impl(I index)
+        at_impl(I /*index*/)
         {
             return vec.at_impl(mpl::int_<I::value>());
         }
@@ -122,7 +122,7 @@ namespace boost { namespace fusion
                 typename mpl::at<types, I>::type
             >::type
         >::type
-        at_impl(I index) const
+        at_impl(I /*index*/) const
         {
             return vec.at_impl(mpl::int_<I::value>());
         }

include/boost/fusion/container/vector/vector10.hpp

@@ -52,7 +52,7 @@ namespace boost { namespace fusion
         vector0() {}
 
         template<typename Sequence>
-        vector0(Sequence const& seq)
+        vector0(Sequence const& /*seq*/)
         {}
     };
 

include/boost/fusion/container/vector/vector_iterator.hpp

@@ -7,11 +7,6 @@
 #if !defined(FUSION_VECTOR_ITERATOR_05042005_0635)
 #define FUSION_VECTOR_ITERATOR_05042005_0635
 
-#if defined (BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning (disable: 4512) // assignment operator could not be generated.
-#endif
-
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/container/vector/detail/deref_impl.hpp>
 #include <boost/fusion/container/vector/detail/value_of_impl.hpp>
@@ -41,15 +36,15 @@ namespace boost { namespace fusion
         typedef vector_iterator_identity<
             typename add_const<Vector>::type, N> identity;
 
-        vector_iterator(Vector& vec)
-            : vec(vec) {}
+        vector_iterator(Vector& in_vec)
+            : vec(in_vec) {}
         Vector& vec;
+
+    private:
+        // silence MSVC warning C4512: assignment operator could not be generated
+        vector_iterator& operator= (vector_iterator const&);
     };
 }}
 
-#if defined (BOOST_MSVC)
-#  pragma warning(pop)
-#endif
-
 #endif