diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-13 12:59:38 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-13 12:59:38 +0000 |
| commit | aafd3b39c4a3f3cde7f70e357fc4953226446c4e (patch) | |
| tree | 0631a228a79c17c8068d9dc4123877d03a66f7ef | |
| parent | 309fe25c69015539bfcab63751ae3cc41bfaaf9f (diff) | |
| download | ppe42-gcc-aafd3b39c4a3f3cde7f70e357fc4953226446c4e.tar.gz ppe42-gcc-aafd3b39c4a3f3cde7f70e357fc4953226446c4e.zip | |
* include/bits/ostream.tcc (__pad_char): Change toplevel '__fmt'
to '__adjust' to avoid shadowing in nested scope.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44849 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 9987e3fa869..9ff18df9887 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * 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 c24f2953005..957622bcbcd 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<char_type*>(__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. |
