[Boost-commit] svn:boost r85882 - in branches/release: boost/variant libs/variant

Subject: [Boost-commit] svn:boost r85882 - in branches/release: boost/variant libs/variant
From: antoshkka_at_[hidden]
Date: 2013-09-25 04:04:36

Author: apolukhin
Date: 2013-09-25 04:04:36 EDT (Wed, 25 Sep 2013)
New Revision: 85882
URL: http://svn.boost.org/trac/boost/changeset/85882

Log:
Merge from trunk:
* Add some merge infos
* Fix unreachable code warning (fixes #8665)

Properties modified: 
   branches/release/boost/variant/   (props changed)
   branches/release/libs/variant/   (props changed)
Text files modified: 
   branches/release/boost/variant/variant.hpp |     7 +++++++                                 
   1 files changed, 7 insertions(+), 0 deletions(-)

Modified: branches/release/boost/variant/variant.hpp
==============================================================================
--- branches/release/boost/variant/variant.hpp	Wed Sep 25 03:55:31 2013	(r85881)
+++ branches/release/boost/variant/variant.hpp	2013-09-25 04:04:36 EDT (Wed, 25 Sep 2013)	(r85882)
@@ -367,6 +367,10 @@
         return operand;
     }
 
+#if defined BOOST_MSVC 
+# pragma warning( push ) 
+# pragma warning( disable : 4702 ) // unreachable code 
+#endif 
     template <typename U>
     T& operator()(U&) const
     {
@@ -374,6 +378,9 @@
         BOOST_ASSERT(false);
         return ::boost::detail::variant::forced_return< T& >();
     }
+#if defined BOOST_MSVC 
+# pragma warning( pop ) 
+#endif
 
 #else // MSVC6