From 5ec2d89d446bc1b0c3a70bc9e3846e3aeedfa702 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Thu, 5 Jul 2018 20:51:27 +0000 Subject: [PATCH] backport: re PR libstdc++/86272 (__gnu_debug::string uses undefined __glibcxx_check_insert_range2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2018-07-05 François Dumont Backport from mainline 2018-07-04 François Dumont PR libstdc++/86272 * include/debug/string (__gnu_debug::basic_string<>::insert<_Ite>(const_iterator, _Ite, _Ite)): Use __glibcxx_check_insert_range. From-SVN: r262455 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/debug/string | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6ecaada6df6a..7813800172a7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2018-07-05 François Dumont + + Backport from mainline + 2018-07-04 François Dumont + + PR libstdc++/86272 + * include/debug/string + (__gnu_debug::basic_string<>::insert<_Ite>(const_iterator, _Ite, _Ite)): + Use __glibcxx_check_insert_range. + 2018-05-14 Jonathan Wakely PR libstdc++/67554 diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string index 7edc6658c0cc..61d033e85bcc 100644 --- a/libstdc++-v3/include/debug/string +++ b/libstdc++-v3/include/debug/string @@ -563,7 +563,7 @@ template, 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), -- 2.47.2