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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3dcd4d8544051686afd42707b13a430e8f57200d..98ad9adf2930e4a3f5878167bd5512e70ccdaad2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h
index e552a57c5e3479a08653aa6d31462ecc9b0ab3bb..0a307657d462a2aa7cad1998b0c0151fe3f18e18 100644 (file)
--- 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);
            }
        }