diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 20:48:29 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 20:48:29 +0000 |
| commit | eb2692571fab1cc9996c0b972aee5e1c48ae0989 (patch) | |
| tree | 862739b146f0c019b81347516a3b305b88d74ec8 /libcxx/include/utility | |
| parent | 3b870f045f571507c541ae386473c665ee110f3f (diff) | |
| download | bcm5719-llvm-eb2692571fab1cc9996c0b972aee5e1c48ae0989.tar.gz bcm5719-llvm-eb2692571fab1cc9996c0b972aee5e1c48ae0989.zip | |
patch by Jesse Towner, and bug fix by Sebastian Redl
llvm-svn: 110724
Diffstat (limited to 'libcxx/include/utility')
| -rw-r--r-- | libcxx/include/utility | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index 578d3130766..19e2893a3ac 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -223,6 +223,8 @@ struct pair second(_STD::forward<_U2>(__u2)) {} +#ifndef _LIBCPP_HAS_NO_VARIADICS + template<class _Tuple, class = typename enable_if<__tuple_convertible<_Tuple, pair>::value>::type> _LIBCPP_INLINE_VISIBILITY @@ -233,7 +235,6 @@ struct pair typename __make_tuple_types<_Tuple>::type>::type>(get<1>(__p))) {} -#ifndef _LIBCPP_HAS_NO_VARIADICS template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2> pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args, tuple<_Args2...> __second_args) @@ -241,7 +242,6 @@ struct pair typename __make_tuple_indices<sizeof...(_Args1)>::type(), typename __make_tuple_indices<sizeof...(_Args2) >::type()) {} -#endif template <class _Tuple, class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type> @@ -256,6 +256,8 @@ struct pair return *this; } +#endif + #else template<class _U1, class _U2> _LIBCPP_INLINE_VISIBILITY pair(const pair<_U1, _U2>& __p) |
