[cfe-commits] [libcxx] r127411 - /libcxx/trunk/include/__tuple

[Howard Hinnant]

Author: hhinnant
Date: Thu Mar 10 11:27:30 2011
New Revision: 127411

URL: http://llvm.org/viewvc/llvm-project?rev=127411&view=rev
Log:
I have to revert this recent fix to tuple conversions until clang implements cwg 1170.  Without this fix pair and tuple don't convert properly.  With it, associative containers get access errors when they shouldn't.  cwg 1170 fixes the latter.

Modified:
    libcxx/trunk/include/__tuple

Modified: libcxx/trunk/include/__tuple
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__tuple?rev=127411&r1=127410&r2=127411&view=diff
==============================================================================
--- libcxx/trunk/include/__tuple (original)
+++ libcxx/trunk/include/__tuple Thu Mar 10 11:27:30 2011
@@ -214,7 +214,11 @@
 template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
 struct __tuple_convertible_imp<true, __tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
     : public integral_constant<bool,
+#if 1 // waiting on cwg 1170
+                               is_convertible<_Tp0, _Up0>::value &&
+#else
                                is_constructible<_Up0, _Tp0>::value &&
+#endif
                                __tuple_convertible_imp<true, __tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
 
 template <>