diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-11-17 00:10:23 +0300 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-11-17 00:10:23 +0300 |
| commit | c4931c4746abb6d6520e6bb3222d2b74a4e49a94 (patch) | |
| tree | 3468b1262fb0e7593ee459945991dc9389d78a36 /libcxx/include/utility | |
| parent | 8b67c720f2e69b9793efd20b341e84a93c628433 (diff) | |
I have reverted all contributions made by Jesse Towner in revision 110724
llvm-svn: 119383
Diffstat (limited to 'libcxx/include/utility')
| -rw-r--r-- | libcxx/include/utility | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index 1c1e4a3912b4..3a6847a213d1 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -218,8 +218,6 @@ struct _LIBCPP_VISIBLE 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 @@ -230,6 +228,8 @@ struct _LIBCPP_VISIBLE 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> _LIBCPP_INLINE_VISIBILITY pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args, @@ -239,6 +239,8 @@ struct _LIBCPP_VISIBLE pair typename __make_tuple_indices<sizeof...(_Args2) >::type()) {} +#endif // _LIBCPP_HAS_NO_VARIADICS + template <class _Tuple, class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type> _LIBCPP_INLINE_VISIBILITY @@ -253,8 +255,6 @@ struct _LIBCPP_VISIBLE pair return *this; } -#endif // _LIBCPP_HAS_NO_VARIADICS - #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES template<class _U1, class _U2> _LIBCPP_INLINE_VISIBILITY pair(const pair<_U1, _U2>& __p) |