diff options
| author | theraven <theraven@FreeBSD.org> | 2012-03-14 00:09:36 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-03-14 00:09:36 +0000 |
| commit | 7bd22d0949674b61e2c1a97cbb6caeeb5ab7fd19 (patch) | |
| tree | 077f044b08d256dd8348f977fe56d18c08fccd78 /contrib/libc++/include/utility | |
| parent | d83b894ff4280333de5ef40496cfd061b515ba54 (diff) | |
| parent | baa75b9984d33ea49ffb76a73507b64d879166cc (diff) | |
| download | FreeBSD-src-7bd22d0949674b61e2c1a97cbb6caeeb5ab7fd19.zip FreeBSD-src-7bd22d0949674b61e2c1a97cbb6caeeb5ab7fd19.tar.gz | |
Import new versions of libcxxrt and libc++.
Please tests any C++ code you care about with -stdlib=libc++!
Approved by: dim (mentor)
Diffstat (limited to 'contrib/libc++/include/utility')
| -rw-r--r-- | contrib/libc++/include/utility | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libc++/include/utility b/contrib/libc++/include/utility index dd9ff33..7facea3 100644 --- a/contrib/libc++/include/utility +++ b/contrib/libc++/include/utility @@ -180,12 +180,12 @@ swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardItera return __first2; } -template<class _Tp, size_t _N> +template<class _Tp, size_t _Np> inline _LIBCPP_INLINE_VISIBILITY void -swap(_Tp (&__a)[_N], _Tp (&__b)[_N]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value) +swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value) { - _VSTD::swap_ranges(__a, __a + _N, __b); + _VSTD::swap_ranges(__a, __a + _Np, __b); } template <class _Tp> @@ -306,7 +306,7 @@ struct _LIBCPP_VISIBLE pair - template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2> + template <class... _Args1, class... _Args2> _LIBCPP_INLINE_VISIBILITY pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args, tuple<_Args2...> __second_args) |
