Ticket #1507: variant_300509.diff

boost/variant/detail/visitation_impl.hpp

@@ -35 +35 @@
 #include "boost/type_traits/has_nothrow_copy.hpp"
 #include "boost/variant/detail/has_nothrow_move.hpp"
 
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+# pragma warning (push)
+# pragma warning (disable : 4702) //unreachable code
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // BOOST_VARIANT_VISITATION_UNROLLING_LIMIT
@@ -283 +287 @@
 }} // namespace detail::variant
 } // namespace boost
 
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) 
+# pragma warning(pop) 
+#endif
+
 #endif // BOOST_VARIANT_DETAIL_VISITATION_IMPL_HPP

boost/variant/variant.hpp

@@ -290 +290 @@
     {
         operand.~T();
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551))
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551)) || BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
         operand; // suppresses warnings
 #endif