Changed constraints on pair and tuple constructors from is_convertible to is_constructible.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134252 91177308-0d34-0410-b5e6-96231b3b80d8
2011-07-01 20:12:51 +00:00
parent 61aa6013c3
commit 74248888ab
2 changed files with 6 additions and 10 deletions
--- a/include/__tuple
+++ b/include/__tuple
@@ -214,11 +214,7 @@ 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 <>