From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 11 Sep 2017 16:54:57 +0000 (+0100)
Subject: Adjust test to pass with old std::string
X-Git-Tag: basepoints/gcc-9~4882
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47d7966a70e1fcf39c11402f02ca3931a02f21eb;p=thirdparty%2Fgcc.git

Adjust test to pass with old std::string

	* testsuite/21_strings/basic_string/lwg2946.cc: Adjust for
	compatibility with old COW std::string.

From-SVN: r251981
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 503159ff799c..33b9cdb20e00 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-11  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/21_strings/basic_string/lwg2946.cc: Adjust for
+	compatibility with old COW std::string.
+
 2017-09-09  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* doc/xml/manual/allocator.xml: Adjust link for Hoard.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc b/libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc
index 74d5a5c89a77..fe1f15553fb2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc
@@ -29,7 +29,7 @@ int main()
   s.assign({"abc", 1});
   s.insert(0, {"abc", 1});
   s.replace(0, 1, {"abc", 1});
-  s.replace(s.cbegin(), s.cbegin(), {"abc", 1});
+  s.replace(s.begin(), s.begin(), {"abc", 1});
   s.find({"abc", 1});
   s.rfind({"abc", 1});
   s.find_first_of({"abc", 1});