From 422f2fb36eda86b496c5226c37de4248becd8625 Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 5 Dec 2005 01:57:59 +0000 Subject: [PATCH] 2005-12-04 Paolo Carlini * include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve): Simplify. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108036 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + * include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve): + Simplify. + +2005-12-04 Paolo Carlini + * 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); } } -- 2.7.4