V3 PATCH: Fix PR #3849

[Gabriel Dos Reis]

Applied on mainline.

Bootstrapped and tested on an i686-pc-linux.

-- Gaby

2001-08-13  Gabriel Dos Reis  <gdr@codesourcery.com>

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

Index: include/bits/ostream.tcc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/include/bits/ostream.tcc,v
retrieving revision 1.13
diff -p -r1.13 ostream.tcc
*** ostream.tcc	2001/07/18 17:58:37	1.13
--- ostream.tcc	2001/08/13 12:58:35
*************** namespace std 
*** 472,487 ****
        char_type* __end;
        size_t __mod = 0;
        size_t __beglen; //either __plen or __oldlen
!       ios_base::fmtflags __fmt = __ios.flags() & ios_base::adjustfield;
  
!       if (__fmt == ios_base::left)
  	{
  	  // Padding last.
  	  __beg = const_cast<char_type*>(__olds);
  	  __beglen = __oldlen;
  	  __end = __pads;
  	}
!       else if (__fmt == ios_base::internal)
  	{
  	  // Pad after the sign, if there is one.
  	  // Pad after 0[xX], if there is one.
--- 472,487 ----
        char_type* __end;
        size_t __mod = 0;
        size_t __beglen; //either __plen or __oldlen
!       ios_base::fmtflags __adjust = __ios.flags() & ios_base::adjustfield;
  
!       if (__adjust == ios_base::left)
  	{
  	  // Padding last.
  	  __beg = const_cast<char_type*>(__olds);
  	  __beglen = __oldlen;
  	  __end = __pads;
  	}
!       else if (__adjust == ios_base::internal)
  	{
  	  // Pad after the sign, if there is one.
  	  // Pad after 0[xX], if there is one.