From 2d5c7f3be70e6e438df7dca64f8876a5a5ede7ee Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Tue, 3 Dec 2013 16:42:25 +0400
Subject: [PATCH] Fix issue #9462 with returning rvalue reference instead of
 returning by copy

---
 doc/any.xml           | 14 +++++++++++++-
 include/boost/any.hpp | 17 +++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/doc/any.xml b/doc/any.xml
index 0f2f9ac..92944cc 100644
--- a/doc/any.xml
+++ b/doc/any.xml
@@ -499,7 +499,19 @@ public:
               <paramtype><classname>any</classname> &amp;</paramtype>
             </parameter>
           </signature>
-          
+
+          <signature>
+            <template>
+              <template-type-parameter name="T"/>
+            </template>
+
+            <type>T</type>
+
+            <parameter name="operand">
+              <paramtype><classname>any</classname> &amp;&amp;</paramtype>
+            </parameter>
+          </signature>
+
           <signature>
             <template>
               <template-type-parameter name="T"/>
diff --git a/include/boost/any.hpp b/include/boost/any.hpp
index 44cfd0a..3798952 100644
--- a/include/boost/any.hpp
+++ b/include/boost/any.hpp
@@ -40,11 +40,6 @@
 #include <cstring>
 # endif 
 
-#if defined(_MSC_VER) 
-#pragma warning(push)
-#pragma warning(disable: 4172) // Mistakenly warns: returning address of local variable or temporary
-#endif
-
 namespace boost
 {
     class any
@@ -293,21 +288,19 @@ namespace boost
     inline ValueType any_cast(const any & operand)
     {
         typedef BOOST_DEDUCED_TYPENAME remove_reference<ValueType>::type nonref;
-
-
         return any_cast<const nonref &>(const_cast<any &>(operand));
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     template<typename ValueType>
-    inline ValueType&& any_cast(any&& operand)
+    inline ValueType any_cast(any&& operand)
     {
         BOOST_STATIC_ASSERT_MSG(
-            boost::is_rvalue_reference<ValueType&&>::value 
+            boost::is_rvalue_reference<ValueType&&>::value /*true if ValueType is rvalue or just a value*/ 
             || boost::is_const< typename boost::remove_reference<ValueType>::type >::value,
             "boost::any_cast shall not be used for getting nonconst references to temporary objects" 
         );
-        return any_cast<ValueType&&>(operand);
+        return any_cast<ValueType>(operand);
     }
 #endif
 
@@ -336,8 +329,4 @@ namespace boost
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 #endif
-- 
1.8.4.4