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 | b929de3c3d5c11d6136be1f59838788b8797ac12 (patch) | |
| tree | 44bf0362437864830e68b5e3139ea97519bca466 /libcxx/include/__tuple | |
| parent | 95d880933b940078a5e80cd50a3d206ac528faa7 (diff) | |
| download | bcm5719-llvm-b929de3c3d5c11d6136be1f59838788b8797ac12.tar.gz bcm5719-llvm-b929de3c3d5c11d6136be1f59838788b8797ac12.zip | |
Changed constraints on pair and tuple constructors from is_convertible to is_constructible.
llvm-svn: 134252
Diffstat (limited to 'libcxx/include/__tuple')
| -rw-r--r-- | libcxx/include/__tuple | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libcxx/include/__tuple b/libcxx/include/__tuple index a9514c1e36f..918656ed838 100644 --- a/libcxx/include/__tuple +++ b/libcxx/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 <> |
