Subject: [Boost-commit] svn:boost r81533 - trunk/boost/thread/detail
From: vicente.botet_at_[hidden]
Date: 2012-11-25 13:30:20
Author: viboes
Date: 2012-11-25 13:30:19 EST (Sun, 25 Nov 2012)
New Revision: 81533
URL: http://svn.boost.org/trac/boost/changeset/81533
Log:
Thread: improve is_convertible workaround to take care bug for of gcc-4.4 and intel 10.1
Text files modified:
trunk/boost/thread/detail/is_convertible.hpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 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-25 13:30:19 EST (Sun, 25 Nov 2012)
@@ -23,6 +23,8 @@
#if defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 1001)
+
#if defined BOOST_THREAD_USES_MOVE
template <typename T1, typename T2>
struct is_convertible<
@@ -30,6 +32,13 @@
rv<rv<T2> > &
> : false_type {};
#endif
+
+#elif defined __GNUC__ && __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
+
+ template <typename T1, typename T2>
+ struct is_convertible<T1&, T2&> : boost::is_convertible<T1, T2> {};
+#endif
+
#endif
}