From 8cad46266c8b5a0124858dd1753c7dafbde3e4cb Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Thu, 10 Mar 2011 17:27:30 +0000
Subject: [PATCH] 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.

llvm-svn: 127411
---
 libcxx/include/__tuple | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libcxx/include/__tuple b/libcxx/include/__tuple
index b9f92c502c20..ddd507ca44df 100644
--- a/libcxx/include/__tuple
+++ b/libcxx/include/__tuple
@@ -214,7 +214,11 @@ struct __tuple_convertible_imp : public false_type {};
 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 <>