diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-09-16 22:26:52 +0000 |
| commit | 854fa44b6f7a32ff94c2a705691da6d3b703574a (patch) | |
| tree | aaccdba1a8c990ea730287a164e76e70733b424a /contrib/libc++/include/__split_buffer | |
| parent | 0e1e5c22c20e636264ff1284083c6af7a1b282cb (diff) | |
| parent | 61b9a7258a7693d7f3674a5a1daf7b036ff1d382 (diff) | |
Notes
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 1d529cbe27d2..727b1b6b5674 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> |