[v3] Fix my bootstrap

[Jerry Quinn <jlquinn at optonline dot net>]

I updated the complete gcc tree around 11:30 and couldn't bootstrap.
In particular, I can't compile the library without this patch.  I'm
perfectly willing to believe this isn't the right solution, but I can
build.

Without it, I get:

make[2]: Entering directory `/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src'
/bin/sh ../libtool --tag CXX --mode=compile /home/jlquinn/gcc/dev/build/gcc/xgcc -shared-libgcc -B/home/jlquinn/gcc/dev/build/gcc/ -nostdinc++ -L/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src -L/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src/.libs -B/usr/local/i686-pc-linux-gnu/bin/ -B/usr/local/i686-pc-linux-gnu/lib/ -isystem /usr/local/i686-pc-linux-gnu/include -isystem /usr/local/i686-pc-linux-gnu/sys-include  -I/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/include/i686-pc-linux-gnu -I/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/include -I/home/jlquinn/gcc/dev/gcc/libstdc++-v3/libsupc++ -O2 -g -O2 -g -O2 -D_GNU_SOURCE -fno-implicit-templates -Wall -W -Wwrite-strings -Wcast-qual  -fdiagnostics-show-location=once  -ffunction-sections -fdata-sections  -c -o ios_init.lo ../../../../gcc/libstdc++-v3/src/ios_init.cc
/home/jlquinn/gcc/dev/build/gcc/xgcc -shared-libgcc -B/home/jlquinn/gcc/dev/build/gcc/ -nostdinc++ -L/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src -L/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src/.libs -B/usr/local/i686-pc-linux-gnu/bin/ -B/usr/local/i686-pc-linux-gnu/lib/ -isystem /usr/local/i686-pc-linux-gnu/include -isystem /usr/local/i686-pc-linux-gnu/sys-include -I/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/include/i686-pc-linux-gnu -I/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/include -I/home/jlquinn/gcc/dev/gcc/libstdc++-v3/libsupc++ -O2 -g -O2 -g -O2 -D_GNU_SOURCE -fno-implicit-templates -Wall -W -Wwrite-strings -Wcast-qual -fdiagnostics-show-location=once -ffunction-sections -fdata-sections -c ../../../../gcc/libstdc++-v3/src/ios_init.cc  -fPIC -DPIC -o .libs/ios_init.o
../../../../gcc/libstdc++-v3/src/ios_init.cc: In constructor `std::ios_base::Init::Init()':
../../../../gcc/libstdc++-v3/src/ios_init.cc:115: error: `buf_cout_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:116: error: `buf_cin_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:117: error: `buf_cerr_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:129: error: `buf_wcout_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:130: error: `buf_wcin_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:131: error: `buf_wcerr_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc: In static member function `static bool std::ios_base::sync_with_stdio(bool)':
../../../../gcc/libstdc++-v3/src/ios_init.cc:188: error: `buf_cout_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:189: error: `buf_cin_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:190: error: `buf_cerr_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:193: error: `buf_wcout_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:194: error: `buf_wcin_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:195: error: `buf_wcerr_sync' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:201: error: `buf_cout' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:202: error: `buf_cin' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:203: error: `buf_cerr' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:210: error: `buf_wcout' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:211: error: `buf_wcin' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:212: error: `buf_wcerr' was not declared in this scope
../../../../gcc/libstdc++-v3/src/ios_init.cc:188: warning: unused variable 'buf_cout_sync'
../../../../gcc/libstdc++-v3/src/ios_init.cc:189: warning: unused variable 'buf_cin_sync'
../../../../gcc/libstdc++-v3/src/ios_init.cc:190: warning: unused variable 'buf_cerr_sync'
../../../../gcc/libstdc++-v3/src/ios_init.cc:193: warning: unused variable 'buf_wcout_sync'
../../../../gcc/libstdc++-v3/src/ios_init.cc:194: warning: unused variable 'buf_wcin_sync'
../../../../gcc/libstdc++-v3/src/ios_init.cc:195: warning: unused variable 'buf_wcerr_sync'
make[2]: *** [ios_init.lo] Error 1
make[2]: Leaving directory `/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/jlquinn/gcc/dev/build/i686-pc-linux-gnu/libstdc++-v3'
make: *** [all] Error 2


2004-04-24  Jerry Quinn  <jlquinn@us.ibm.com>

        * src/ios_init.cc: Move __gnu_internal declarations inside
        namespace std block;


*** ios_init.cc.~1.6.~	Fri Apr 23 16:14:32 2004
--- ios_init.cc	Sat Apr 24 00:26:10 2004
***************
*** 40,73 ****
  #include <ext/stdio_filebuf.h>
  #include <ext/stdio_sync_filebuf.h>
  
! namespace __gnu_internal
  {
    using namespace __gnu_cxx;
  
!   // Extern declarations for global objects in src/globals.cc.
!   extern stdio_sync_filebuf<char> buf_cout_sync;
!   extern stdio_sync_filebuf<char> buf_cin_sync;
!   extern stdio_sync_filebuf<char> buf_cerr_sync;
! 
!   extern stdio_filebuf<char> buf_cout;
!   extern stdio_filebuf<char> buf_cin;
!   extern stdio_filebuf<char> buf_cerr;
! 
! #ifdef _GLIBCXX_USE_WCHAR_T
!   extern stdio_sync_filebuf<wchar_t> buf_wcout_sync;
!   extern stdio_sync_filebuf<wchar_t> buf_wcin_sync;
!   extern stdio_sync_filebuf<wchar_t> buf_wcerr_sync;
! 
!   extern stdio_filebuf<wchar_t> buf_wcout;
!   extern stdio_filebuf<wchar_t> buf_wcin;
!   extern stdio_filebuf<wchar_t> buf_wcerr;
  #endif
! } // namespace __gnu_internal
  
- namespace std 
- {
-   using namespace __gnu_internal;
-   
    extern istream cin;
    extern ostream cout;
    extern ostream cerr;
--- 40,72 ----
  #include <ext/stdio_filebuf.h>
  #include <ext/stdio_sync_filebuf.h>
  
! namespace std 
  {
+   using namespace __gnu_internal;
    using namespace __gnu_cxx;
  
!   namespace __gnu_internal
!   {
!     // Extern declarations for global objects in src/globals.cc.
!     extern stdio_sync_filebuf<char> buf_cout_sync;
!     extern stdio_sync_filebuf<char> buf_cin_sync;
!     extern stdio_sync_filebuf<char> buf_cerr_sync;
! 
!     extern stdio_filebuf<char> buf_cout;
!     extern stdio_filebuf<char> buf_cin;
!     extern stdio_filebuf<char> buf_cerr;
! 
! #ifdef _GLIBCXX_USE_WCHAR_T
!     extern stdio_sync_filebuf<wchar_t> buf_wcout_sync;
!     extern stdio_sync_filebuf<wchar_t> buf_wcin_sync;
!     extern stdio_sync_filebuf<wchar_t> buf_wcerr_sync;
! 
!     extern stdio_filebuf<wchar_t> buf_wcout;
!     extern stdio_filebuf<wchar_t> buf_wcin;
!     extern stdio_filebuf<wchar_t> buf_wcerr;
  #endif
!   }
  
    extern istream cin;
    extern ostream cout;
    extern ostream cerr;