[Boost-commit] svn:boost r81503 - trunk/boost/thread/detail

Subject: [Boost-commit] svn:boost r81503 - trunk/boost/thread/detail
From: vicente.botet_at_[hidden]
Date: 2012-11-24 02:07:49

Author: viboes
Date: 2012-11-24 02:07:48 EST (Sat, 24 Nov 2012)
New Revision: 81503
URL: http://svn.boost.org/trac/boost/changeset/81503

Log:
Thread: update is_convertible workaround to try to avoid a regression on intel.12.0
Text files modified: 
   trunk/boost/thread/detail/is_convertible.hpp |    12 ++++++++++--                            
   1 files changed, 10 insertions(+), 2 deletions(-)

Modified: trunk/boost/thread/detail/is_convertible.hpp
==============================================================================
--- trunk/boost/thread/detail/is_convertible.hpp	(original)
+++ trunk/boost/thread/detail/is_convertible.hpp	2012-11-24 02:07:48 EST (Sat, 24 Nov 2012)
@@ -12,6 +12,7 @@
 #define BOOST_THREAD_DETAIL_IS_CONVERTIBLE_HPP
 
 #include <boost/type_traits/is_convertible.hpp>
+#include <boost/thread/detail/move.hpp>
 
 namespace boost
 {
@@ -20,9 +21,16 @@
     template <typename T1, typename T2>
     struct is_convertible : boost::is_convertible<T1,T2> {};
 
-    template <typename T1, typename T2>
-    struct is_convertible<T1&, T2&> : boost::is_convertible<T1, T2> {};
+#if defined  BOOST_NO_CXX11_RVALUE_REFERENCES
 
+#if defined BOOST_THREAD_USES_MOVE
+    template <typename T1, typename T2>
+    struct is_convertible<
+      rv<T1> &,
+      rv<rv<T2> > &
+    > : false_type {};
+#endif
+#endif
   }
 
 } // namespace boost