From fe45ab59cade9d174745e66a9daaae828645cf6b Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Mon, 13 Aug 2001 12:59:38 +0000 Subject: [PATCH] ostream.tcc (__pad_char): Change toplevel '__fmt' to '__adjust' to avoid shadowing in nested scope. * include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt' to '__adjust' to avoid shadowing in nested scope. From-SVN: r44849 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/ostream.tcc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9987e3fa8699..9ff18df9887d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2001-08-13 Gabriel Dos Reis + + * include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt' + to '__adjust' to avoid shadowing in nested scope. + 2001-08-10 Gabriel Dos Reis * include/bits/std_limits.h(__glibcpp_char_is_signed): Use diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index c24f29530056..957622bcbcd5 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -472,16 +472,16 @@ namespace std char_type* __end; size_t __mod = 0; 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. __beg = const_cast(__olds); __beglen = __oldlen; __end = __pads; } - else if (__fmt == ios_base::internal) + else if (__adjust == ios_base::internal) { // Pad after the sign, if there is one. // Pad after 0[xX], if there is one. -- 2.47.2