OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locale_facets.tcc (_M_insert_int, [...]): Move a couple of vars inside an if block. 

2003-11-09  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (_M_insert_int,
	_M_insert_float): Move a couple of vars inside an if block.

From-SVN: r73395
This commit is contained in:
Paolo Carlini 2003-11-09 19:15:25 +00:00
parent 647af4a91c
commit f6a7db9ee1
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-09 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (_M_insert_int,
_M_insert_float): Move a couple of vars inside an if block.
2003-11-09 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/12971
@ -34,22 +39,22 @@
2003-11-07 Robert Millan <robertmh@gnu.org>
* configure.host: Add kfreebsd*-gnu and knetbsd*-gnu.
* crossconfig.m4: Likewise.
* configure: Regenerate.
* configure.host: Add kfreebsd*-gnu and knetbsd*-gnu.
* crossconfig.m4: Likewise.
* configure: Regenerate.
2003-11-07 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h
(qualifier_list<Allocator>::decode_qualifiers(string_type&,
string_type&, bool member_function_pointer_qualifiers):
Always seperate the '[' of an array type with a space from
what is left of it, except when that is the closing bracket
of another array dimension.
* include/bits/demangle.h
(qualifier_list<Allocator>::decode_qualifiers(string_type&,
string_type&, bool member_function_pointer_qualifiers):
Always separate the '[' of an array type with a space from
what is left of it, except when that is the closing bracket
of another array dimension.
2003-11-07 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h
* include/bits/demangle.h
(qualifier_list<Allocator>::decode_qualifiers(string_type&,
string_type&, bool) const): Made const.
(qualifier_list<Allocator>::M_printing_suppressed): Added mutable.

19
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -816,25 +816,23 @@ namespace std
__cs += __ilen - __len;
// Add grouping, if necessary.
_CharT* __cs2;
if (__lc->_M_use_grouping)
{
// Grouping can add (almost) as many separators as the
// number of digits, but no more.
__cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2));
_CharT* __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2));
_M_group_int(__lc->_M_grouping, __lc->_M_thousands_sep, __io,
__cs2, __cs, __len);
__cs = __cs2;
}
// Pad.
_CharT* __cs3;
const streamsize __w = __io.width();
if (__w > static_cast<streamsize>(__len))
{
__cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __w));
_CharT* __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __w));
_M_pad(__fill, __w, __io, __cs3, __cs, __len);
__cs = __cs3;
}
@ -967,24 +965,23 @@ namespace std
__ws[__p - __ws] = __dec;
// Add grouping, if necessary.
_CharT* __ws2;
if (__lc->_M_use_grouping)
{
// Grouping can add (almost) as many separators as the
// number of digits, but no more.
__ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2));
_CharT* __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2));
_M_group_float(__lc->_M_grouping, __lc->_M_thousands_sep, __p,
__ws2, __ws, __len);
__ws = __ws2;
}
// Pad.
_CharT* __ws3;
const streamsize __w = __io.width();
if (__w > static_cast<streamsize>(__len))
{
__ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __w));
_CharT* __ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __w));
_M_pad(__fill, __w, __io, __ws3, __ws, __len);
__ws = __ws3;
}