Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r57533 - in branches/release/boost/fusion: . adapted/struct container/list container/vector/detail sequence/io/detail view/filter_view view/nview view/transform_view
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-09 21:37:20


Author: hkaiser
Date: 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
New Revision: 57533
URL: http://svn.boost.org/trac/boost/changeset/57533

Log:
Fusion: merged fixes for MSVC warnings from trunk
Properties modified:
   branches/release/boost/fusion/ (props changed)
Text files modified:
   branches/release/boost/fusion/adapted/struct/struct_iterator.hpp | 4 ++++
   branches/release/boost/fusion/container/list/cons_iterator.hpp | 6 +++++-
   branches/release/boost/fusion/container/vector/detail/vector_n.hpp | 6 +++---
   branches/release/boost/fusion/sequence/io/detail/in.hpp | 4 ++--
   branches/release/boost/fusion/sequence/io/detail/manip.hpp | 4 ++++
   branches/release/boost/fusion/sequence/io/detail/out.hpp | 4 ++--
   branches/release/boost/fusion/view/filter_view/filter_view.hpp | 4 ++++
   branches/release/boost/fusion/view/nview/nview_iterator.hpp | 4 ++++
   branches/release/boost/fusion/view/transform_view/transform_view.hpp | 4 ++++
   branches/release/boost/fusion/view/transform_view/transform_view_iterator.hpp | 8 ++++++++
   10 files changed, 40 insertions(+), 8 deletions(-)

Modified: branches/release/boost/fusion/adapted/struct/struct_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/struct/struct_iterator.hpp (original)
+++ branches/release/boost/fusion/adapted/struct/struct_iterator.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -95,6 +95,10 @@
                 return type();
             }
         };
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ struct_iterator& operator= (struct_iterator const&);
     };
 }}
 

Modified: branches/release/boost/fusion/container/list/cons_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/container/list/cons_iterator.hpp (original)
+++ branches/release/boost/fusion/container/list/cons_iterator.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -34,11 +34,15 @@
         typedef cons_iterator_identity<
             typename add_const<Cons>::type>
         identity;
-
+
         explicit cons_iterator(cons_type& cons)
             : cons(cons) {}
 
         cons_type& cons;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ cons_iterator& operator= (cons_iterator const&);
     };
 
     struct nil_iterator : iterator_base<nil_iterator>

Modified: branches/release/boost/fusion/container/vector/detail/vector_n.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/detail/vector_n.hpp (original)
+++ branches/release/boost/fusion/container/vector/detail/vector_n.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -105,7 +105,7 @@
         BOOST_PP_CAT(vector, N)(
             Sequence const& seq
 #if (N == 1)
- , typename disable_if<is_convertible<Sequence, T0> >::type* dummy = 0
+ , typename disable_if<is_convertible<Sequence, T0> >::type* /*dummy*/ = 0
 #endif
             )
             : base_type(base_type::init_from_sequence(seq)) {}
@@ -133,14 +133,14 @@
 
         template<typename I>
         typename add_reference<typename mpl::at<types, I>::type>::type
- at_impl(I i)
+ at_impl(I)
         {
             return this->at_impl(mpl::int_<I::value>());
         }
 
         template<typename I>
         typename add_reference<typename add_const<typename mpl::at<types, I>::type>::type>::type
- at_impl(I i) const
+ at_impl(I) const
         {
             return this->at_impl(mpl::int_<I::value>());
         }

Modified: branches/release/boost/fusion/sequence/io/detail/in.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/io/detail/in.hpp (original)
+++ branches/release/boost/fusion/sequence/io/detail/in.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -35,7 +35,7 @@
 
         template <typename IS>
         static void
- read(IS& is, char const* delim, mpl::true_)
+ read(IS&, char const*, mpl::true_)
         {
         }
     };
@@ -44,7 +44,7 @@
     {
         template <typename IS, typename First, typename Last>
         static void
- call(IS& is, First const&, Last const&, mpl::true_)
+ call(IS&, First const&, Last const&, mpl::true_)
         {
         }
 

Modified: branches/release/boost/fusion/sequence/io/detail/manip.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/io/detail/manip.hpp (original)
+++ branches/release/boost/fusion/sequence/io/detail/manip.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -146,6 +146,10 @@
             }
 
             Stream& stream;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ string_ios_manip& operator= (string_ios_manip const&);
         };
 
     } // detail

Modified: branches/release/boost/fusion/sequence/io/detail/out.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/io/detail/out.hpp (original)
+++ branches/release/boost/fusion/sequence/io/detail/out.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -35,7 +35,7 @@
 
         template <typename OS>
         static void
- print(OS& os, char const* delim, mpl::true_)
+ print(OS&, char const*, mpl::true_)
         {
         }
     };
@@ -44,7 +44,7 @@
     {
         template <typename OS, typename First, typename Last>
         static void
- call(OS& os, First const&, Last const&, mpl::true_)
+ call(OS&, First const&, Last const&, mpl::true_)
         {
         }
 

Modified: branches/release/boost/fusion/view/filter_view/filter_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/filter_view.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/filter_view.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -43,6 +43,10 @@
         first_type first() const { return fusion::begin(seq); }
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ filter_view& operator= (filter_view const&);
     };
 }}
 

Modified: branches/release/boost/fusion/view/nview/nview_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/nview/nview_iterator.hpp (original)
+++ branches/release/boost/fusion/view/nview/nview_iterator.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -45,6 +45,10 @@
           : seq(seq) {}
 
         Sequence& seq;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ nview_iterator& operator= (nview_iterator const&);
     };
 
 }}

Modified: branches/release/boost/fusion/view/transform_view/transform_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/transform_view/transform_view.hpp (original)
+++ branches/release/boost/fusion/view/transform_view/transform_view.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -99,6 +99,10 @@
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
         transform_type f;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ transform_view& operator= (transform_view const&);
     };
 }}
 

Modified: branches/release/boost/fusion/view/transform_view/transform_view_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/transform_view/transform_view_iterator.hpp (original)
+++ branches/release/boost/fusion/view/transform_view/transform_view_iterator.hpp 2009-11-09 21:37:19 EST (Mon, 09 Nov 2009)
@@ -39,6 +39,10 @@
 
         first_type first;
         transform_type f;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ transform_view_iterator& operator= (transform_view_iterator const&);
     };
 
     // Binary Version
@@ -62,6 +66,10 @@
         first1_type first1;
         first2_type first2;
         transform_type f;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ transform_view_iterator2& operator= (transform_view_iterator2 const&);
     };
 }}
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk