diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2018-07-05 20:48:02 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2018-07-05 20:48:02 +0000 |
| commit | 9cf008d9963f6fcafae17fc15c82c1228824af40 (patch) | |
| tree | fdfe6c7ebd927ee92a100c7c375c87ca6e98bbf6 | |
| parent | d5d3f79041aa324ede5dccab9664a076da6a5f51 (diff) | |
2018-07-05 François Dumont <fdumont@gcc.gnu.org>
Backport from mainline
2018-07-04 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/86272
* include/debug/string
(__gnu_debug::basic_string<>::insert<_Ite>(const_iterator, _Ite, _Ite)):
Use __glibcxx_check_insert_range.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262454 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/string | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cdd338a7b41..88b54b41622 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2018-07-05 François Dumont <fdumont@gcc.gnu.org> + + Backport from mainline + 2018-07-04 François Dumont <fdumont@gcc.gnu.org> + + PR libstdc++/86272 + * include/debug/string + (__gnu_debug::basic_string<>::insert<_Ite>(const_iterator, _Ite, _Ite)): + Use __glibcxx_check_insert_range. + 2018-07-04 Jonathan Wakely <jwakely@redhat.com> Backport from mainline diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string index 9d4057b7d43..2c4f1aa3963 100644 --- a/libstdc++-v3/include/debug/string +++ b/libstdc++-v3/include/debug/string @@ -565,7 +565,7 @@ template<typename _CharT, typename _Traits = std::char_traits<_CharT>, insert(iterator __p, _InputIterator __first, _InputIterator __last) { typename __gnu_debug::_Distance_traits<_InputIterator>::__type __dist; - __glibcxx_check_insert_range2(__p, __first, __last, __dist); + __glibcxx_check_insert_range(__p, __first, __last, __dist); if (__dist.second >= __dp_sign) _Base::insert(__p.base(), __gnu_debug::__unsafe(__first), |