Skip to content

R
riscv-gcc-1
Commit c92334d4 by Jonathan Wakely Committed by Jonathan Wakely
Options

alloc_traits.h (__alloc_traits::_S_nothrow_swap()): Use __is_nothrow_swappable. 

	* include/ext/alloc_traits.h (__alloc_traits::_S_nothrow_swap()): Use
	__is_nothrow_swappable.

From-SVN: r224552
parent db40fbca
Showing with 6 additions and 2 deletions
libstdc++-v3/ChangeLog
2015-06-17 Jonathan Wakely <jwakely@redhat.com>
* include/ext/alloc_traits.h (__alloc_traits::_S_nothrow_swap()): Use
__is_nothrow_swappable.
2015-06-16 Jonathan Wakely <jwakely@redhat.com> 2015-06-16 Jonathan Wakely <jwakely@redhat.com>
* include/bits/allocated_ptr.h (__allocated_ptr): Use __addressof. * include/bits/allocated_ptr.h (__allocated_ptr): Use __addressof.
......
libstdc++-v3/include/ext/alloc_traits.h
...@@ -159,9 +159,8 @@ template<typename _Alloc> ...@@ -159,9 +159,8 @@ template<typename _Alloc>
static constexpr bool _S_nothrow_swap() static constexpr bool _S_nothrow_swap()
{ {
using std::swap;
return !_S_propagate_on_swap() return !_S_propagate_on_swap()
|| noexcept(swap(std::declval<_Alloc&>(), std::declval<_Alloc&>())); || std::__is_nothrow_swappable<_Alloc>::value;
} }
template<typename _Tp> template<typename _Tp>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment