FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

basic_string.tcc (_Rep::_S_create): Minor tweak.

Browse source 
2004-01-31  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/basic_string.tcc (_Rep::_S_create): Minor tweak.

From-SVN: r77035
This commit is contained in:
Paolo Carlini 2004-01-31 15:39:52 +00:00 • committed by Paolo Carlini
parent 4500e76d5e
commit 24f330691d
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,7 @@
2004-01-31 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.tcc (_Rep::_S_create): Minor tweak.
2004-01-30 Paolo Carlini <pcarlini@suse.de> 2004-01-30 Paolo Carlini <pcarlini@suse.de>
* testsuite/21_strings/basic_string/cons/char/6.cc: New. * testsuite/21_strings/basic_string/cons/char/6.cc: New.

11
libstdc++-v3/include/bits/basic_string.tcc
View file

@ -514,11 +514,10 @@ namespace std
// Whew. Seemingly so needy, yet so elemental. // Whew. Seemingly so needy, yet so elemental.
size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep); size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
if (__size + __malloc_header_size > __pagesize) const size_type __adj_size = __size + __malloc_header_size;
if (__adj_size > __pagesize)
{ {
const size_type __extra = (__pagesize const size_type __extra = __pagesize - __adj_size % __pagesize;
- (__size + __malloc_header_size)
% __pagesize);
__capacity += __extra / sizeof(_CharT); __capacity += __extra / sizeof(_CharT);
// Never allocate a string bigger than _S_max_size. // Never allocate a string bigger than _S_max_size.
if (__capacity > _S_max_size) if (__capacity > _S_max_size)
@ -527,9 +526,7 @@ namespace std
} }
else if (__size > __subpagesize) else if (__size > __subpagesize)
{ {
const size_type __extra = (__subpagesize const size_type __extra = __subpagesize - __adj_size % __subpagesize;
- (__size + __malloc_header_size)
% __subpagesize);
__capacity += __extra / sizeof(_CharT); __capacity += __extra / sizeof(_CharT);
__size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep); __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
} }