From: fdumont Date: Thu, 23 Jun 2016 20:21:47 +0000 (+0000) Subject: 2016-06-23 François Dumont X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2e78ed5e8aa7b0cef5c56d4727360a9581c4cb7;p=thirdparty%2Fgcc.git 2016-06-23 François Dumont * include/debug/array (array<>::swap): Fix noexcept qualificaton for zero-size array. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@237747 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c8f4a7fdd007..87f65a3168a6 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 e12d25f6e765..6d51309694af 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); }