diff options
| author | dim <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
| commit | ea5248cdc11d47e16b420831d52143ca4afb904a (patch) | |
| tree | aaccdba1a8c990ea730287a164e76e70733b424a /contrib/libc++/include/__split_buffer | |
| parent | 5cc32d7f18f18fb3a5f4155b7f748cc7be60d2da (diff) | |
| parent | 50ffe587e08aebe69879f2e5b67ba1304ff781b3 (diff) | |
| download | FreeBSD-src-ea5248cdc11d47e16b420831d52143ca4afb904a.zip FreeBSD-src-ea5248cdc11d47e16b420831d52143ca4afb904a.tar.gz | |
Update libc++ to 3.7.0 release.
Diffstat (limited to 'contrib/libc++/include/__split_buffer')
| -rw-r--r-- | contrib/libc++/include/__split_buffer | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/contrib/libc++/include/__split_buffer b/contrib/libc++/include/__split_buffer index 1d529cb..727b1b6 100644 --- a/contrib/libc++/include/__split_buffer +++ b/contrib/libc++/include/__split_buffer @@ -156,25 +156,6 @@ private: _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(__split_buffer&, false_type) _NOEXCEPT {} - - _LIBCPP_INLINE_VISIBILITY - static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y) - _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value|| - __is_nothrow_swappable<__alloc_rr>::value) - {__swap_alloc(__x, __y, integral_constant<bool, - __alloc_traits::propagate_on_container_swap::value>());} - - _LIBCPP_INLINE_VISIBILITY - static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y, true_type) - _NOEXCEPT_(__is_nothrow_swappable<__alloc_rr>::value) - { - using _VSTD::swap; - swap(__x, __y); - } - - _LIBCPP_INLINE_VISIBILITY - static void __swap_alloc(__alloc_rr&, __alloc_rr&, false_type) _NOEXCEPT - {} }; template <class _Tp, class _Allocator> @@ -431,7 +412,7 @@ __split_buffer<_Tp, _Allocator>::swap(__split_buffer& __x) _VSTD::swap(__begin_, __x.__begin_); _VSTD::swap(__end_, __x.__end_); _VSTD::swap(__end_cap(), __x.__end_cap()); - __swap_alloc(__alloc(), __x.__alloc()); + __swap_allocator(__alloc(), __x.__alloc()); } template <class _Tp, class _Allocator> |
