From 37b0eb2c485bce1a8ef2d2bd15b5829ceed52ec0 Mon Sep 17 00:00:00 2001
From: "Vicente J. Botet Escriba" <vicente.botet@wanadoo.fr>
Date: Sat, 24 Nov 2012 07:07:48 +0000
Subject: [PATCH] Thread: update is_convertible workaround to try to avoid a
 regression on intel.12.0

[SVN r81503]
---
 include/boost/thread/detail/is_convertible.hpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/boost/thread/detail/is_convertible.hpp b/include/boost/thread/detail/is_convertible.hpp
index 051a2712..4602131d 100644
--- a/include/boost/thread/detail/is_convertible.hpp
+++ b/include/boost/thread/detail/is_convertible.hpp
@@ -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 @@ namespace boost
     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