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

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

From-SVN: r44849

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9987e3f..9ff18df 100644 (file)
--- 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 c24f295..957622b 100644 (file)
--- 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.