aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-09-11 17:54:57 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2017-09-11 17:54:57 +0100
commit47d7966a70e1fcf39c11402f02ca3931a02f21eb (patch)
tree4ceb89256e9592f225378cc2f07406f1fe077b10 /libstdc++-v3
parenteaddd128de97c5c32a3819747de2e3100e286a7a (diff)
downloadgcc-47d7966a70e1fcf39c11402f02ca3931a02f21eb.zip
gcc-47d7966a70e1fcf39c11402f02ca3931a02f21eb.tar.gz
gcc-47d7966a70e1fcf39c11402f02ca3931a02f21eb.tar.bz2
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/lwg2946.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 503159f..33b9cdb 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 74d5a5c..fe1f155 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});