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

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
c92334d4 · Jonathan Wakely · Jonathan Wakely · db40fbca · c92334d4 · c92334d4
Commit c92334d4 authored Jun 17, 2015 by Jonathan Wakely Committed by Jonathan Wakely Jun 17, 2015
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

libstdc++-v3/ChangeLog
+5 -0

libstdc++-v3/include/ext/alloc_traits.h
+1 -2

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/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>

 	* include/bits/allocated_ptr.h (__allocated_ptr): Use __addressof.

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