[Boost-commit] svn:boost r57532 - branches/release/boost/variant

Subject: [Boost-commit] svn:boost r57532 - branches/release/boost/variant
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-09 21:36:46

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

Log:
Variant: merged fixes for MSVC warnings from trunk
Properties modified: 
   branches/release/boost/variant/   (props changed)
Text files modified: 
   branches/release/boost/variant/variant.hpp |    23 ++++++++++++++++++++++-                 
   1 files changed, 22 insertions(+), 1 deletions(-)

Modified: branches/release/boost/variant/variant.hpp
==============================================================================
--- branches/release/boost/variant/variant.hpp	(original)
+++ branches/release/boost/variant/variant.hpp	2009-11-09 21:36:45 EST (Mon, 09 Nov 2009)
@@ -293,7 +293,8 @@
     {
         operand.~T();
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551))
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551)) || \
+    BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
         operand; // suppresses warnings
 #endif
 
@@ -532,6 +533,11 @@
 
 #endif // MSVC6 workaround
 
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
+private:
+    // silence MSVC warning C4512: assignment operator could not be generated
+    direct_assigner& operator= (direct_assigner const&);
+#endif
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -650,6 +656,11 @@
         BOOST_VARIANT_AUX_RETURN_VOID;
     }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
+private:
+    // silence MSVC warning C4512: assignment operator could not be generated
+    backup_assigner& operator= (backup_assigner const&);
+#endif
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -899,6 +910,11 @@
         return internal_visit( operand.get(), 1L );
     }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
+private:
+    // silence MSVC warning C4512: assignment operator could not be generated
+    invoke_visitor& operator= (invoke_visitor const&);
+#endif
 };
 
 }} // namespace detail::variant
@@ -1549,6 +1565,11 @@
             BOOST_VARIANT_AUX_RETURN_VOID;
         }
 
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
+    private:
+        // silence MSVC warning C4512: assignment operator could not be generated
+        assigner& operator= (assigner const&);
+#endif
     };
 
     friend class assigner;