more explicit instantiations

[Phil Edwards]

I'm looking at PR 3829, where a user passed -fno-implicit-templates and got
undefined iomanip-related symbols during linking.  He included a "patch" in
the form of a complete copy of src/misc-inst.cc with stuff added.  (Grrrrrr.)

After a "vdiff" using my handy Mark I Eyeball set, I added a more correct
version to my local tree.  This allows both the PR test code and the
testcase below to link *iff* the instantiations are present in the library.
Verified on i686/linux and powerpc-eabisim with no additional regressions.

Unless there are any objections, I'll commit this after Benjamin rolls
and announces the 3.0.95 snapshot.  I don't think it needs to be on the
3.0 branch...?


Index: src/misc-inst.cc
===================================================================
RCS file: /home/pme/Repositories/GCC/gcc/libstdc++-v3/src/misc-inst.cc,v
retrieving revision 1.12
diff -u -3 -r1.12 misc-inst.cc
--- src/misc-inst.cc	28 Nov 2001 04:07:10 -0000	1.12
+++ src/misc-inst.cc	23 Dec 2001 03:08:29 -0000
@@ -44,6 +44,7 @@
 #include <bits/std_istream.h>
 #include <bits/std_ostream.h>
 #include <bits/std_string.h>
+#include <bits/std_iomanip.h>
 
 // NB: unnecessary if the .h headers include these
 #ifndef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
@@ -94,6 +95,17 @@
 
 
   //
+  // iomanip
+  //
+  template class _Setfill<char>;
+  template _Setfill<char> setfill(char);
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template class _Setfill<wchar_t>;
+  template _Setfill<wchar_t> setfill(wchar_t);
+#endif
+
+
+  //
   // istream
   //
   template class basic_istream<char>;
@@ -104,11 +116,20 @@
   template istream& operator>>(istream&, char*);
   template istream& operator>>(istream&, unsigned char*);
   template istream& operator>>(istream&, signed char*);
+
+  template istream& operator>>(istream&, _Setiosflags);
+  template istream& operator>>(istream&, _Resetiosflags);
+  template istream& operator>>(istream&, _Setbase);
+  template istream& operator>>(istream&, _Setfill<char>);
+  template istream& operator>>(istream&, _Setprecision);
+  template istream& operator>>(istream&, _Setw);
+
 #ifdef _GLIBCPP_USE_WCHAR_T
   template class basic_istream<wchar_t>;
   template wistream& ws(wistream&);
   template wistream& operator>>(wistream&, wchar_t&);
   template wistream& operator>>(wistream&, wchar_t*);
+  template wistream& operator>>(wistream&, _Setfill<wchar_t>);
 #endif
 
 
@@ -125,6 +146,14 @@
   template ostream& operator<<(ostream&, const char*);
   template ostream& operator<<(ostream&, const unsigned char*);
   template ostream& operator<<(ostream&, const signed char*);
+
+  template ostream& operator<<(ostream&, _Setiosflags);
+  template ostream& operator<<(ostream&, _Resetiosflags);
+  template ostream& operator<<(ostream&, _Setbase);
+  template ostream& operator<<(ostream&, _Setfill<char>);
+  template ostream& operator<<(ostream&, _Setprecision);
+  template ostream& operator<<(ostream&, _Setw);
+
 #ifdef _GLIBCPP_USE_WCHAR_T
   template class basic_ostream<wchar_t>;
   template wostream& endl(wostream&);
@@ -134,6 +163,7 @@
   template wostream& operator<<(wostream&, char);
   template wostream& operator<<(wostream&, const wchar_t*);
   template wostream& operator<<(wostream&, const char*);
+  template wostream& operator<<(wostream&, _Setfill<wchar_t>);
 #endif
   
 
Index: testsuite/27_io/instantiations.cc
===================================================================
RCS file: testsuite/27_io/instantiations.cc
diff -N testsuite/27_io/instantiations.cc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/27_io/instantiations.cc	23 Dec 2001 03:18:24 -0000
@@ -0,0 +1,68 @@
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// Some members need to be explicitly instantiated, so that users can build
+// their own code with -fno-implicit-templates and not suffer from a zillion
+// link errors.
+
+// { dg-options "-fno-implicit-templates" }
+
+#include <fstream>
+#include <istream>
+#include <ostream>
+#include <sstream>
+#include <iomanip>
+#include <testsuite_hooks.h>
+
+
+// PR libstdc++/3829
+void
+test01()
+{
+  using namespace std;
+  string x ("   this is text");
+  istringstream  sin (x);
+  ostringstream  sout;
+
+  // same order as in bits/std_iomanip.h
+  sin >> resetiosflags(ios_base::dec)
+      >> setiosflags(ios_base::dec)
+      >> setbase(ios_base::dec)
+      >> setfill('c')
+      >> setprecision(5)
+      >> setw(20)
+      >> ws;
+  VERIFY(sin);
+
+  sout << resetiosflags(ios_base::dec)
+       << setiosflags(ios_base::dec)
+       << setbase(ios_base::dec)
+       << setfill('c')
+       << setprecision(5)
+       << setw(20)
+       << ends << flush << endl;
+  VERIFY(sout);
+}
+
+
+int
+main()
+{
+  test01();
+  return 0;
+}