diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2016-06-23 20:21:47 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2016-06-23 20:21:47 +0000 |
| commit | e615c24c30674468fe655898b31f6b2eabb66e2b (patch) | |
| tree | ee3e99a8647682b36e47b21b3e9925ab2c014a54 | |
| parent | 7bb5d5f42db0fabd8a6ccdc2cc46526dd5f209d4 (diff) | |
| download | gcc-e615c24c30674468fe655898b31f6b2eabb66e2b.zip gcc-e615c24c30674468fe655898b31f6b2eabb66e2b.tar.gz gcc-e615c24c30674468fe655898b31f6b2eabb66e2b.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/array | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c8f4a7f..87f65a3 100644 --- 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 e12d25f..6d51309 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); } |