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 503159ff799cc89cb80cda38a3f38d6900537c3e..33b9cdb20e00396c98c7cdd1a527ff5f2681e0e3 100644 (file)
--- 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 74d5a5c89a778b8e12074a13d56c56c8d50f87e7..fe1f15553fb261e7e47ce77213772239d1acc169 100644 (file)
--- 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});