diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-06 19:46:21 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-06 19:46:21 +0000 |
| commit | be3b69b47033cee08596e21902898825fdcfb9a9 (patch) | |
| tree | 30de72987c15fac125aa6308bc6a00f6bb2d9671 /libstdc++-v3 | |
| parent | a3abe7feb3e2175c8d16826ab6a876ca93189f5d (diff) | |
2003-10-06 Paolo Carlini <pcarlini@unitus.it>
* include/bits/locale_facets.tcc (__pad<>::_S_pad):
Improve performance-wise: avoid one traits::copy, avoid
the __builtin_alloca, streamline.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72164 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 40 |
2 files changed, 18 insertions, 28 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4944684e6d0..3b9fe29d72d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-10-06 Paolo Carlini <pcarlini@unitus.it> + + * include/bits/locale_facets.tcc (__pad<>::_S_pad): + Improve performance-wise: avoid one traits::copy, avoid + the __builtin_alloca, streamline. + 2003-10-05 Paolo Carlini <pcarlini@unitus.it> * include/bits/locale_facets.tcc diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 483d421f5ea..7a4acb5783a 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -2207,25 +2207,19 @@ namespace std const streamsize __newlen, const streamsize __oldlen, const bool __num) { - size_t __plen = static_cast<size_t>(__newlen - __oldlen); - _CharT* __pads = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) - * __plen)); - _Traits::assign(__pads, __plen, __fill); - - _CharT* __beg; - _CharT* __end; - size_t __mod = 0; - size_t __beglen; //either __plen or __oldlen - ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield; + const size_t __plen = static_cast<size_t>(__newlen - __oldlen); + const ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield; + // Padding last. if (__adjust == ios_base::left) { - // Padding last. - __beg = const_cast<_CharT*>(__olds); - __beglen = __oldlen; - __end = __pads; + _Traits::copy(__news, const_cast<_CharT*>(__olds), __oldlen); + _Traits::assign(__news + __oldlen, __plen, __fill); + return; } - else if (__adjust == ios_base::internal && __num) + + size_t __mod = 0; + if (__adjust == ios_base::internal && __num) { // Pad after the sign, if there is one. // Pad after 0[xX], if there is one. @@ -2254,20 +2248,10 @@ namespace std ++__news; } // else Padding first. - - __beg = __pads; - __beglen = __plen; - __end = const_cast<_CharT*>(__olds + __mod); - } - else - { - // Padding first. - __beg = __pads; - __beglen = __plen; - __end = const_cast<_CharT*>(__olds); } - _Traits::copy(__news, __beg, __beglen); - _Traits::copy(__news + __beglen, __end, __newlen - __beglen - __mod); + _Traits::assign(__news, __plen, __fill); + _Traits::copy(__news + __plen, const_cast<_CharT*>(__olds + __mod), + __oldlen - __mod); } template<typename _CharT> |