diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-06-17 10:51:46 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-06-17 10:51:46 +0000 |
| commit | f3c08b92531f2e6a4c8d769fb1096a84cca8de16 (patch) | |
| tree | 86fff65492d3c28c85951f5ea1cb5f92dc475153 | |
| parent | b8b0c0292cbcf68702895298c38e1181418a3a50 (diff) | |
* include/ext/alloc_traits.h (__alloc_traits::_S_nothrow_swap()): Use
__is_nothrow_swappable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224552 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/alloc_traits.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a9ed2064aea..caa32f7383a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * include/bits/allocated_ptr.h (__allocated_ptr): Use __addressof. diff --git a/libstdc++-v3/include/ext/alloc_traits.h b/libstdc++-v3/include/ext/alloc_traits.h index 06bc70a4cb2..bd0f75945aa 100644 --- a/libstdc++-v3/include/ext/alloc_traits.h +++ b/libstdc++-v3/include/ext/alloc_traits.h @@ -159,9 +159,8 @@ template<typename _Alloc> static constexpr bool _S_nothrow_swap() { - using std::swap; return !_S_propagate_on_swap() - || noexcept(swap(std::declval<_Alloc&>(), std::declval<_Alloc&>())); + || std::__is_nothrow_swappable<_Alloc>::value; } template<typename _Tp> |