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

ostream.tcc (__pad_char): Change toplevel '__fmt' to '__adjust' to avoid shadowing in nested scope.

Browse Source 
* include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt'
      to '__adjust' to avoid shadowing in nested scope.

From-SVN: r44849
This commit is contained in:
Gabriel Dos Reis 2001-08-13 12:59:38 +00:00 committed by Gabriel Dos Reis
parent afea858033
commit fe45ab59ca
2 changed files with 8 additions and 3 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 @@
2001-08-13 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
* include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt'
to '__adjust' to avoid shadowing in nested scope.
2001-08-10 Gabriel Dos Reis <gdr@merlin.codesourcery.com> 2001-08-10 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
* include/bits/std_limits.h(__glibcpp_char_is_signed): Use * include/bits/std_limits.h(__glibcpp_char_is_signed): Use

6
libstdc++-v3/include/bits/ostream.tcc
View File

@ -472,16 +472,16 @@ namespace std
char_type* __end; char_type* __end;
size_t __mod = 0; size_t __mod = 0;
size_t __beglen; //either __plen or __oldlen size_t __beglen; //either __plen or __oldlen
ios_base::fmtflags __fmt = __ios.flags() & ios_base::adjustfield; ios_base::fmtflags __adjust = __ios.flags() & ios_base::adjustfield;
if (__fmt == ios_base::left) if (__adjust == ios_base::left)
{ {
// Padding last. // Padding last.
__beg = const_cast<char_type*>(__olds); __beg = const_cast<char_type*>(__olds);
__beglen = __oldlen; __beglen = __oldlen;
__end = __pads; __end = __pads;
} }
else if (__fmt == ios_base::internal) else if (__adjust == ios_base::internal)
{ {
// Pad after the sign, if there is one. // Pad after the sign, if there is one.
// Pad after 0[xX], if there is one. // Pad after 0[xX], if there is one.