From 47d7966a70e1fcf39c11402f02ca3931a02f21eb Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 11 Sep 2017 17:54:57 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 503159ff799..33b9cdb20e0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2017-09-11 Jonathan Wakely + + * testsuite/21_strings/basic_string/lwg2946.cc: Adjust for + compatibility with old COW std::string. + 2017-09-09 Gerald Pfeifer * 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 74d5a5c89a7..fe1f15553fb 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}); -- 2.30.2