mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-13 14:45:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

sso_string_base.h (__sso_string_base<>::_M_assign): Simplify, avoid pointless reallocations.

Browse Source 
2005-12-05  Paolo Carlini  <pcarlini@suse.de>

	* include/ext/sso_string_base.h (__sso_string_base<>::_M_assign):
	Simplify, avoid pointless reallocations.

From-SVN: r108063
This commit is contained in:
Paolo Carlini 2005-12-05 16:39:18 +00:00 committed by Paolo Carlini
parent 53917868b8
commit afe6d70550
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-05 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_assign):
Simplify, avoid pointless reallocations.
2005-12-04 Paolo Carlini <pcarlini@suse.de> 2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve): * include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):

26
libstdc++-v3/include/ext/sso_string_base.h
View File

@ -455,22 +455,22 @@ namespace __gnu_cxx
{ {
if (this != &__rcs) if (this != &__rcs)
{ {
size_type __size = __rcs._M_length(); const size_type __rsize = __rcs._M_length();
const size_type __capacity = _M_capacity();
_CharT* __tmp = _M_local_data; if (__rsize > __capacity)
if (__size > size_type(_S_local_capacity)) {
__tmp = _M_create(__size, size_type(0)); size_type __new_capacity = __rsize;
_CharT* __tmp = _M_create(__new_capacity, __capacity);
_M_dispose();
_M_data(__tmp);
_M_capacity(__new_capacity);
}
_M_dispose(); if (__rsize)
_M_data(__tmp); _S_copy(_M_data(), __rcs._M_data(), __rsize);
if (__size) _M_set_length(__rsize);
_S_copy(_M_data(), __rcs._M_data(), __size);
if (!_M_is_local())
_M_capacity(__size);
_M_set_length(__size);
} }
} }