git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2015-06-17 11:51:46 +01:00 committed by Jonathan Wakely
parent db40fbca24
commit c92334d4c5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
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.

3
libstdc++-v3/include/ext/alloc_traits.h
View File

@ -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>