diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-10-10 07:44:56 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-10-10 03:44:56 -0400 |
| commit | 9cd60aa99b7471aa513b269dcc38c77f5bb5cb8e (patch) | |
| tree | 71321acb8ceacf65269028e066063d397f4461b0 | |
| parent | 38bab5d4c64bf5953eef0ff6e9467ed60e0ad52c (diff) | |
| download | gcc-9cd60aa99b7471aa513b269dcc38c77f5bb5cb8e.zip gcc-9cd60aa99b7471aa513b269dcc38c77f5bb5cb8e.tar.gz gcc-9cd60aa99b7471aa513b269dcc38c77f5bb5cb8e.tar.bz2 | |
bastring.h: Use ibegin internally.
* std/bastring.h: Use ibegin internally. Return passed iterator
instead of recalculating it were appropriate.
* std/bastring.cc: Adjust for erase.
From Yotam Medini:
* std/bastring.h: Replace remove with erase.
From-SVN: r15887
| -rw-r--r-- | libstdc++/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++/std/bastring.cc | 2 | ||||
| -rw-r--r-- | libstdc++/std/bastring.h | 22 |
3 files changed, 21 insertions, 12 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index cb66cab..a1bf0a4 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -1,3 +1,12 @@ +Fri Oct 10 00:40:00 1997 Jason Merrill <jason@yorick.cygnus.com> + + * std/bastring.h: Use ibegin internally. Return passed iterator + instead of recalculating it were appropriate. + * std/bastring.cc: Adjust for erase. + + From Yotam Medini: + * std/bastring.h: Replace remove with erase. + Thu Oct 9 23:24:36 1997 Jason Merrill <jason@yorick.cygnus.com> * stdexcepti.cc (__out_of_range): New fn. diff --git a/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc index 155656a..aa151da 100644 --- a/libstdc++/std/bastring.cc +++ b/libstdc++/std/bastring.cc @@ -220,7 +220,7 @@ resize (size_t n, charT c) if (n > length ()) append (n - length (), c); else - remove (n); + erase (n); } template <class charT, class traits> diff --git a/libstdc++/std/bastring.h b/libstdc++/std/bastring.h index 9eae46f..59a5995 100644 --- a/libstdc++/std/bastring.h +++ b/libstdc++/std/bastring.h @@ -220,9 +220,9 @@ public: basic_string& insert (size_type pos, size_type n, charT c) { return replace (pos, 0, n, c); } iterator insert(iterator p, charT c) - { size_type pos = p - begin (); insert (pos, 1, c); return pos +begin (); } + { insert (p - ibegin (), 1, c); return p; } iterator insert(iterator p, size_type n, charT c) - { size_type pos = p - begin (); insert (pos, n, c); return pos +begin (); } + { insert (p - ibegin (), n, c); return p; } #ifdef __STL_MEMBER_TEMPLATES template<class InputIterator> void insert(iterator p, InputIterator first, InputIterator last) @@ -231,12 +231,12 @@ public: #endif { replace (p, p, first, last); } - basic_string& remove (size_type pos = 0, size_type n = npos) + basic_string& erase (size_type pos = 0, size_type n = npos) { return replace (pos, n, (size_type)0, (charT)0); } - basic_string& remove (iterator pos) - { return replace (pos - begin (), 1, (size_type)0, (charT)0); } - basic_string& remove (iterator first, iterator last) - { return replace (first - begin (), last - first, (size_type)0, (charT)0);} + iterator erase(iterator p) + { replace (p - ibegin (), 1, (size_type)0, (charT)0); return p; } + iterator erase(iterator f, iterator l) + { replace (f - ibegin (), l - f, (size_type)0, (charT)0); return f; } basic_string& replace (size_type pos1, size_type n1, const basic_string& str, size_type pos2 = 0, size_type n2 = npos); @@ -248,13 +248,13 @@ public: basic_string& replace (size_type pos, size_type n, charT c) { return replace (pos, n, 1, c); } basic_string& replace (iterator i1, iterator i2, const basic_string& str) - { return replace (i1 - begin (), i2 - i1, str); } + { return replace (i1 - ibegin (), i2 - i1, str); } basic_string& replace (iterator i1, iterator i2, const charT* s, size_type n) - { return replace (i1 - begin (), i2 - i1, s, n); } + { return replace (i1 - ibegin (), i2 - i1, s, n); } basic_string& replace (iterator i1, iterator i2, const charT* s) - { return replace (i1 - begin (), i2 - i1, s); } + { return replace (i1 - ibegin (), i2 - i1, s); } basic_string& replace (iterator i1, iterator i2, size_type n, charT c) - { return replace (i1 - begin (), i2 - i1, n, c); } + { return replace (i1 - ibegin (), i2 - i1, n, c); } #ifdef __STL_MEMBER_TEMPLATES template<class InputIterator> basic_string& replace(iterator i1, iterator i2, |