From: François Dumont <fdumont@gcc.gnu.org>
Date: Thu, 5 Jul 2018 20:51:27 +0000 (+0000)
Subject: backport: re PR libstdc++/86272 (__gnu_debug::string uses undefined __glibcxx_check_i... 
X-Git-Tag: releases/gcc-6.5.0~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec2d89d446bc1b0c3a70bc9e3846e3aeedfa702;p=thirdparty%2Fgcc.git

backport: re PR libstdc++/86272 (__gnu_debug::string uses undefined __glibcxx_check_insert_range2)

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.

From-SVN: r262455
---

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  <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-05-14  Jonathan Wakely  <jwakely@redhat.com>
 
 	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<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),