Author: hhinnant
Date: Fri Aug 17 12:54:11 2012
New Revision: 162111
URL: http://llvm.org/viewvc/llvm-project?rev=162111&view=rev
Log:
Apply patches supplied by Michel Morin in
http://llvm.org/bugs/show_bug.cgi?id=13601 to correct bugs in is_convertible
for the case that the intrinsic __is_convertible_to is not available.
Modified:
libcxx/trunk/include/type_traits
Modified: libcxx/trunk/include/type_traits
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=162111&r1=162110&r2=162111&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Fri Aug 17 12:54:11 2012
@@ -619,11 +619,7 @@
namespace __is_convertible_imp
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> char __test(const volatile typename
remove_reference<_Tp>::type&&);
-#else
template <class _Tp> char __test(_Tp);
-#endif
template <class _Tp> __two __test(...);
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class _Tp> _Tp&& __source();
@@ -658,7 +654,14 @@
unsigned _T2_is_array_function_or_void =
__is_convertible_imp::__is_array_function_or_void<_T2>::value>
struct __is_convertible
: public integral_constant<bool,
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
sizeof(__is_convertible_imp::__test<_T2>(__is_convertible_imp::__source<_T1>()))
== 1
+#else
+
sizeof(__is_convertible_imp::__test<_T2>(__is_convertible_imp::__source<_T1>()))
== 1
+ && !(!is_function<_T1>::value && !is_reference<_T1>::value &&
is_reference<_T2>::value
+ && (!is_const<typename remove_reference<_T2>::type>::value
+ || is_volatile<typename remove_reference<_T2>::type>::value))
+#endif
>
{};
@@ -688,6 +691,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class _T1> struct __is_convertible<_T1, _T1&&, 2, 0>
: public true_type {};
#endif
+template <class _T1> struct __is_convertible<_T1, _T1&, 2, 0>
: public true_type {};
template <class _T1> struct __is_convertible<_T1, _T1*, 2, 0>
: public true_type {};
template <class _T1> struct __is_convertible<_T1, _T1*const, 2, 0>
: public true_type {};
template <class _T1> struct __is_convertible<_T1, _T1*volatile, 2,
0> : public true_type {};
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
