diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-12-05 01:57:59 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-12-05 01:57:59 +0000 |
| commit | 56540d20c22609161b4ebcb340b05050b39c6701 (patch) | |
| tree | ac3da7678df119cc57c2ad0984971447ea119ded | |
| parent | cf8829194fb63dc0c25253934e1cff4bf4c7f6ca (diff) | |
| download | gcc-56540d20c22609161b4ebcb340b05050b39c6701.zip gcc-56540d20c22609161b4ebcb340b05050b39c6701.tar.gz gcc-56540d20c22609161b4ebcb340b05050b39c6701.tar.bz2 | |
sso_string_base.h (__sso_string_base<>::_M_reserve): Simplify.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Simplify.
From-SVN: r108036
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/sso_string_base.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3dcd4d8..98ad9ad 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2005-12-04 Paolo Carlini <pcarlini@suse.de> + * include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve): + Simplify. + +2005-12-04 Paolo Carlini <pcarlini@suse.de> + * include/ext/vstring.h (__versa_string<>::operator+, all versions): Move out of line... * include/ext/vstring.tcc (__versa_string<>::operator+): ... diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index e552a57..0a30765 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -497,9 +497,8 @@ namespace __gnu_cxx } else if (!_M_is_local()) { - const size_type __tmp_capacity = _M_allocated_capacity; _S_copy(_M_local_data, _M_data(), _M_length() + 1); - _M_destroy(__tmp_capacity + 1); + _M_destroy(__capacity + 1); _M_data(_M_local_data); } } |