Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85222 - trunk/boost/type_traits
From: antoshkka_at_[hidden]
Date: 2013-08-06 11:37:00


Author: apolukhin
Date: 2013-08-06 11:37:00 EDT (Tue, 06 Aug 2013)
New Revision: 85222
URL: http://svn.boost.org/trac/boost/changeset/85222

Log:
Atempt to workaround Intel issue with SFINAE (refs #8802)

Text files modified:
   trunk/boost/type_traits/is_copy_constructible.hpp | 7 +++++++
   1 files changed, 7 insertions(+), 0 deletions(-)

Modified: trunk/boost/type_traits/is_copy_constructible.hpp
==============================================================================
--- trunk/boost/type_traits/is_copy_constructible.hpp Tue Aug 6 09:36:38 2013 (r85221)
+++ trunk/boost/type_traits/is_copy_constructible.hpp 2013-08-06 11:37:00 EDT (Tue, 06 Aug 2013) (r85222)
@@ -27,8 +27,15 @@
 template <bool DerivedFromNoncopyable, class T>
 struct is_copy_constructible_impl2 {
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+
+#ifdef BOOST_NO_CXX11_DECLTYPE
     template <class T1>
     static boost::type_traits::yes_type test(T1&, boost::mpl::int_<sizeof(T1(boost::declval<T1&>()))>* = 0);
+#else
+ template <class T1>
+ static boost::type_traits::yes_type test(T1&, decltype(T1(boost::declval<T1&>()))* = 0);
+#endif
+
     static boost::type_traits::no_type test(...);
 #else
     template <class T1>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk