array (array<>::swap): Fix noexcept qualificaton for zero-size array.

2016-06-23  François Dumont  <fdumont@gcc.gnu.org>

	* include/debug/array (array<>::swap): Fix noexcept qualificaton for
	zero-size array.

From-SVN: r237747

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c8f4a7fdd007fa788b8dddc8fd0c86de60c0770a..87f65a3168a6746aeecfa0c697f0207e345e2f99 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-23  François Dumont  <fdumont@gcc.gnu.org>
+
+       * include/debug/array (array<>::swap): Fix noexcept qualificaton for
+       zero-size array.
+
 2016-06-21  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * configure.host: Remove mep-* support.

diff --git a/libstdc++-v3/include/debug/array b/libstdc++-v3/include/debug/array
index e12d25f6e7659660e372c28c638985b0a29abce8..6d51309694af54f466a6ef66a095ea52ab5d16b9 100644 (file)
--- a/libstdc++-v3/include/debug/array
+++ b/libstdc++-v3/include/debug/array
@@ -86,7 +86,7 @@ namespace __debug
 
       void
       swap(array& __other)
-      noexcept(__is_nothrow_swappable<_Tp>::value)
+      noexcept(_AT_Type::_Is_nothrow_swappable::value)
       { std::swap_ranges(begin(), end(), __other.begin()); }
 
       // Iterators.
@@ -168,9 +168,8 @@ namespace __debug
       at(size_type __n)
       {
        if (__n >= _Nm)
-         std::__throw_out_of_range_fmt(__N("array::at: __n "
-                                           "(which is %zu) >= _Nm "
-                                           "(which is %zu)"),
+         std::__throw_out_of_range_fmt(__N("array::at: __n (which is %zu) "
+                                           ">= _Nm (which is %zu)"),
                                        __n, _Nm);
        return _AT_Type::_S_ref(_M_elems, __n);
       }