Commit f6a7db9e by Paolo Carlini

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
parent 647af4a9
2003-11-09 Paolo Carlini <pcarlini@suse.de> 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 PR libstdc++/12971
* include/bits/locale_facets.tcc * include/bits/locale_facets.tcc
(money_put::do_put(..., long double)): Fix conversion (money_put::do_put(..., long double)): Fix conversion
...@@ -34,22 +39,22 @@ ...@@ -34,22 +39,22 @@
2003-11-07 Robert Millan <robertmh@gnu.org> 2003-11-07 Robert Millan <robertmh@gnu.org>
* configure.host: Add kfreebsd*-gnu and knetbsd*-gnu. * configure.host: Add kfreebsd*-gnu and knetbsd*-gnu.
* crossconfig.m4: Likewise. * crossconfig.m4: Likewise.
* configure: Regenerate. * configure: Regenerate.
2003-11-07 Carlo Wood <carlo@alinoe.com> 2003-11-07 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h * include/bits/demangle.h
(qualifier_list<Allocator>::decode_qualifiers(string_type&, (qualifier_list<Allocator>::decode_qualifiers(string_type&,
string_type&, bool member_function_pointer_qualifiers): string_type&, bool member_function_pointer_qualifiers):
Always seperate the '[' of an array type with a space from Always separate the '[' of an array type with a space from
what is left of it, except when that is the closing bracket what is left of it, except when that is the closing bracket
of another array dimension. of another array dimension.
2003-11-07 Carlo Wood <carlo@alinoe.com> 2003-11-07 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h * include/bits/demangle.h
(qualifier_list<Allocator>::decode_qualifiers(string_type&, (qualifier_list<Allocator>::decode_qualifiers(string_type&,
string_type&, bool) const): Made const. string_type&, bool) const): Made const.
(qualifier_list<Allocator>::M_printing_suppressed): Added mutable. (qualifier_list<Allocator>::M_printing_suppressed): Added mutable.
......
...@@ -816,25 +816,23 @@ namespace std ...@@ -816,25 +816,23 @@ namespace std
__cs += __ilen - __len; __cs += __ilen - __len;
// Add grouping, if necessary. // Add grouping, if necessary.
_CharT* __cs2;
if (__lc->_M_use_grouping) if (__lc->_M_use_grouping)
{ {
// Grouping can add (almost) as many separators as the // Grouping can add (almost) as many separators as the
// number of digits, but no more. // number of digits, but no more.
__cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) _CharT* __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2)); * __len * 2));
_M_group_int(__lc->_M_grouping, __lc->_M_thousands_sep, __io, _M_group_int(__lc->_M_grouping, __lc->_M_thousands_sep, __io,
__cs2, __cs, __len); __cs2, __cs, __len);
__cs = __cs2; __cs = __cs2;
} }
// Pad. // Pad.
_CharT* __cs3;
const streamsize __w = __io.width(); const streamsize __w = __io.width();
if (__w > static_cast<streamsize>(__len)) if (__w > static_cast<streamsize>(__len))
{ {
__cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) _CharT* __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __w)); * __w));
_M_pad(__fill, __w, __io, __cs3, __cs, __len); _M_pad(__fill, __w, __io, __cs3, __cs, __len);
__cs = __cs3; __cs = __cs3;
} }
...@@ -967,24 +965,23 @@ namespace std ...@@ -967,24 +965,23 @@ namespace std
__ws[__p - __ws] = __dec; __ws[__p - __ws] = __dec;
// Add grouping, if necessary. // Add grouping, if necessary.
_CharT* __ws2;
if (__lc->_M_use_grouping) if (__lc->_M_use_grouping)
{ {
// Grouping can add (almost) as many separators as the // Grouping can add (almost) as many separators as the
// number of digits, but no more. // number of digits, but no more.
__ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) _CharT* __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __len * 2)); * __len * 2));
_M_group_float(__lc->_M_grouping, __lc->_M_thousands_sep, __p, _M_group_float(__lc->_M_grouping, __lc->_M_thousands_sep, __p,
__ws2, __ws, __len); __ws2, __ws, __len);
__ws = __ws2; __ws = __ws2;
} }
// Pad. // Pad.
_CharT* __ws3;
const streamsize __w = __io.width(); const streamsize __w = __io.width();
if (__w > static_cast<streamsize>(__len)) 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); _M_pad(__fill, __w, __io, __ws3, __ws, __len);
__ws = __ws3; __ws = __ws3;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment