(class basic_string): Return correct iterators in erase member functions.

git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@20906 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 2 deletions

diff --git a/libstdc++/std/bastring.h b/libstdc++/std/bastring.h
index 8b009a4ad8c..5e334e666ff 100644
--- a/libstdc++/std/bastring.h
+++ b/libstdc++/std/bastring.h
@@ -227,9 +227,13 @@ public:
   basic_string& erase (size_type pos = 0, size_type n = npos)
     { return replace (pos, n, (size_type)0, (charT)0); }
   iterator erase(iterator p)
-    { replace (p-ibegin (), 1, (size_type)0, (charT)0); selfish (); return p; }
+    { size_type __o = p - begin();
+      replace (__o, 1, (size_type)0, (charT)0); selfish ();
+      return ibegin() + __o; }
   iterator erase(iterator f, iterator l)
-    { replace (f-ibegin (), l-f, (size_type)0, (charT)0);selfish ();return f; }
+    { size_type __o = f - ibegin();
+      replace (__o, l-f, (size_type)0, (charT)0);selfish ();
+      return ibegin() + __o; }
 
   basic_string& replace (size_type pos1, size_type n1, const basic_string& str,
 			 size_type pos2 = 0, size_type n2 = npos);