From e615c24c30674468fe655898b31f6b2eabb66e2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Thu, 23 Jun 2016 20:21:47 +0000 Subject: [PATCH] array (array<>::swap): Fix noexcept qualificaton for zero-size array. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-06-23 François Dumont * include/debug/array (array<>::swap): Fix noexcept qualificaton for zero-size array. From-SVN: r237747 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/debug/array | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c8f4a7fdd00..87f65a3168a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-06-23 François Dumont + + * include/debug/array (array<>::swap): Fix noexcept qualificaton for + zero-size array. + 2016-06-21 Trevor Saunders * configure.host: Remove mep-* support. diff --git a/libstdc++-v3/include/debug/array b/libstdc++-v3/include/debug/array index e12d25f6e76..6d51309694a 100644 --- 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); } -- 2.30.2