c

2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>

	* src/misc-inst.cc: Define unnecessary algorithm
	instantiations. Break apart instantiations into groupings below.
	* src/fstream-inst.cc: New.
	* src/io-inst.cc: New.
	* src/istream-inst.cc: New.
	* src/ostream-inst.cc: New.
	* src/streambuf-inst.cc: New.
	* src/sstream-inst.cc: New.
	* src/Makefile.am (sources): Add files.
	* src/Makefile.in: Regenerate.

	* acinclude.m4: Work around automake 1.4-p5 bug, change
	AM_GNU_GETTEXT in comments to AM-GNU-GETTEXT.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53930 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 178 deletions

diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc
index 07a4b1a1aa2..5576d2cb22a 100644
--- a/libstdc++-v3/src/misc-inst.cc
+++ b/libstdc++-v3/src/misc-inst.cc
@@ -33,173 +33,13 @@
 //
 
 #include <string>
-#include <algorithm>
-#include <locale>
-#include <vector>
-#include <iterator>
-#include <streambuf>
-#include <sstream>
-#include <fstream>
-#include <ios>
 #include <istream>
 #include <ostream>
-#include <iomanip>
-#include <ext/stdio_filebuf.h>
-
-// NB: Unnecessary if the .h headers already include these.
-#ifndef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
-#include <bits/sstream.tcc>
-#include <bits/fstream.tcc>
-#include <bits/streambuf.tcc>
-#include <bits/istream.tcc>
-#include <bits/ostream.tcc>
-#endif
+#include <algorithm>
+#include <vector>
 
 namespace std
 {
-  // streambuf
-  template class basic_streambuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_streambuf<wchar_t>;
-#endif
-
-  // stringbuf
-  template class basic_stringbuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_stringbuf<wchar_t>;
-#endif
-
-  // filebuf
-  template class basic_filebuf<char, char_traits<char> >;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_filebuf<wchar_t, char_traits<wchar_t> >;
-#endif
-
-  // basic_ios
-  template class basic_ios<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_ios<wchar_t>;
-#endif
-
-  // 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>;
-  template istream& ws(istream&);
-  template istream& operator>>(istream&, char&);
-  template istream& operator>>(istream&, unsigned char&);
-  template istream& operator>>(istream&, signed char&);
-  template istream& operator>>(istream&, char*);
-  template istream& operator>>(istream&, unsigned char*);
-  template istream& operator>>(istream&, signed char*);
-
-  template istream& operator>>(istream&, _Setfill<char>);
-  template istream& operator>>(istream&, _Setiosflags);
-  template istream& operator>>(istream&, _Resetiosflags);
-  template istream& operator>>(istream&, _Setbase);
-  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>);
-  template wistream& operator>>(wistream&, _Setiosflags);
-  template wistream& operator>>(wistream&, _Resetiosflags);
-  template wistream& operator>>(wistream&, _Setbase);
-  template wistream& operator>>(wistream&, _Setprecision);
-  template wistream& operator>>(wistream&, _Setw);
-#endif
-
-  // ostream
-  template class basic_ostream<char>;
-  template ostream& endl(ostream&);
-  template ostream& ends(ostream&);
-  template ostream& flush(ostream&);
-  template ostream& operator<<(ostream&, char);
-  template ostream& operator<<(ostream&, unsigned char);
-  template ostream& operator<<(ostream&, signed char);
-  template ostream& operator<<(ostream&, const char*);
-  template ostream& operator<<(ostream&, const unsigned char*);
-  template ostream& operator<<(ostream&, const signed char*);
-
-  template ostream& operator<<(ostream&, _Setfill<char>);
-  template ostream& operator<<(ostream&, _Setiosflags);
-  template ostream& operator<<(ostream&, _Resetiosflags);
-  template ostream& operator<<(ostream&, _Setbase);
-  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&);
-  template wostream& ends(wostream&);
-  template wostream& flush(wostream&);
-  template wostream& operator<<(wostream&, wchar_t);
-  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>);
-  template wostream& operator<<(wostream&, _Setiosflags);
-  template wostream& operator<<(wostream&, _Resetiosflags);
-  template wostream& operator<<(wostream&, _Setbase);
-  template wostream& operator<<(wostream&, _Setprecision);
-  template wostream& operator<<(wostream&, _Setw);
-#endif
-  
-
-  // iostream
-  template class basic_iostream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_iostream<wchar_t>; 
-#endif
-
-  // ifstream
-  template class basic_ifstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_ifstream<wchar_t>;
-#endif
-
-  // ofstream
-  template class basic_ofstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_ofstream<wchar_t>;
-#endif
-
-  // fstream
-  template class basic_fstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_fstream<wchar_t>;
-#endif
-
-  // istringstream
-  template class basic_istringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_istringstream<wchar_t>; 
-#endif
-
-  // ostringstream
-  template class basic_ostringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_ostringstream<wchar_t>; 
-#endif
-
-  // stringstream
-  template class basic_stringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_stringstream<wchar_t>; 
-#endif
-
   // string related to iostreams
   template 
     basic_istream<char>& 
@@ -228,6 +68,10 @@ namespace std
     getline(basic_istream<wchar_t>&, wstring&);
 #endif
 
+#if 1
+  // XXX
+  // 2002-05-24 These are no longer needed and should be deleted.
+
   // algorithm
   typedef  _Char_traits_match<char, char_traits<char> > char_match;
 
@@ -254,21 +98,5 @@ namespace std
     __uninitialized_copy_aux<vector<string>::const_iterator, string *>
     (vector<string>::const_iterator, vector<string>::const_iterator, 
      string*, __false_type);
-
-  template
-    streamsize
-    __copy_streambufs(basic_ios<char>&, basic_streambuf<char>*,
-		      basic_streambuf<char>*); 
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template
-    streamsize
-    __copy_streambufs(basic_ios<wchar_t>&, basic_streambuf<wchar_t>*,
-		      basic_streambuf<wchar_t>*); 
-#endif
-  
-  using __gnu_cxx::stdio_filebuf;
-  template class stdio_filebuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class stdio_filebuf<wchar_t>;
 #endif
 } //std