diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 20:12:51 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 20:12:51 +0000 |
| commit | 74248888ab9d6e32a3ab3d3d69719445e50a3d65 (patch) | |
| tree | 9d14a19efcd0ed33de6438ee4a35d111674c66a7 /include/__tuple | |
| parent | 61aa6013c3377203aff484cf3300ac26511c26ac (diff) | |
| download | external_libcxx-74248888ab9d6e32a3ab3d3d69719445e50a3d65.tar.gz external_libcxx-74248888ab9d6e32a3ab3d3d69719445e50a3d65.tar.bz2 external_libcxx-74248888ab9d6e32a3ab3d3d69719445e50a3d65.zip | |
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
Diffstat (limited to 'include/__tuple')
| -rw-r--r-- | include/__tuple | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/__tuple b/include/__tuple index a9514c1e3..918656ed8 100644 --- 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 <> |