X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fsrc%2Fmisc-inst.cc;h=b9bc29882f09fe89ae5f642a41aaaa91275d6fe3;hb=6067e9807a695d8fead92de6ff0c1884c7712cf9;hp=a512c99a245a82b60350c27979dc86cf51762720;hpb=15d58875be0278438dbb68f8f0cb4ae50f099f55;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc
index a512c99a245..b9bc29882f0 100644
--- a/libstdc++-v3/src/misc-inst.cc
+++ b/libstdc++-v3/src/misc-inst.cc
@@ -1,6 +1,7 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+// 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
@@ -31,198 +32,51 @@
 // ISO C++ 14882:
 //
 
-#include <bits/std_string.h>
-#include <bits/std_algorithm.h>
-#include <bits/std_locale.h>
-#include <bits/std_vector.h>
-#include <bits/std_iterator.h>
-#include <bits/std_streambuf.h>
-#include <bits/std_sstream.h>
-#include <bits/std_fstream.h>
-#include <bits/std_ios.h>
-#include <bits/basic_ios.tcc>
-#include <bits/std_istream.h>
-#include <bits/std_ostream.h>
-
-// NB: unnecessary if the .h headers 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
-
-namespace std {
-
-  //
-  // streambuf
-  // 
-  template class basic_streambuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_streambuf<wchar_t>;
-#endif
-
-
-  //
-  // stringstream
-  //
-  template class basic_stringbuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template class basic_stringbuf<wchar_t>;
-#endif
-
-
-  //
-  // fstream
-  //
-  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
-
-
-  //
-  // 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*);
-#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*);
-#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&, _Setw);
-  // template _Setfill<char> setfill(char);
-#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&, _Setw);
-  // template _Setfill<wchar_t> setfill(wchar_t);
-#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
-
-
-  //
-  // 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
-
-
-  //
-  // algorithm
-  //
-  typedef  _Char_traits_match<char, char_traits<char> > char_match;
-
+#include <string>
+#include <istream>
+#include <ostream>
+#include <algorithm>
+#include <vector>
+#include <bits/atomicity.h>
+#include <ext/stdio_sync_filebuf.h>
+
+namespace std
+{
+  // string related to iostreams
   template 
-    const char*  
-    find_if<const char *, char_match>
-    (const char *, const char *, char_match, random_access_iterator_tag);
-
-#ifdef _GLIBCPP_USE_WCHAR_T
-  typedef  _Char_traits_match<wchar_t, char_traits<wchar_t> > wchar_match;
-
-  template const wchar_t*  
-    find_if<const wchar_t*, wchar_match>
-    (const wchar_t*, const wchar_t*, wchar_match, random_access_iterator_tag);
-#endif
-  
+    basic_istream<char>& 
+    operator>>(basic_istream<char>&, string&);
   template 
-    string* 
-    __uninitialized_fill_n_aux<string*, size_t, string>
-    (string*, size_t, string const &, _Bool<false>);
-
+    basic_ostream<char>& 
+    operator<<(basic_ostream<char>&, const string&);
   template 
-    string* 
-    __uninitialized_copy_aux<vector<string>::const_iterator, string *>
-    (vector<string>::const_iterator, vector<string>::const_iterator, 
-     string*, _Bool<false>);
-
-} //std
-
-
-
-
-
-
-
+    basic_istream<char>& 
+    getline(basic_istream<char>&, string&, char);
+  template 
+    basic_istream<char>& 
+    getline(basic_istream<char>&, string&);
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template 
+    basic_istream<wchar_t>& 
+    operator>>(basic_istream<wchar_t>&, wstring&);
+  template 
+    basic_ostream<wchar_t>& 
+    operator<<(basic_ostream<wchar_t>&, const wstring&);
+  template 
+    basic_istream<wchar_t>& 
+    getline(basic_istream<wchar_t>&, wstring&, wchar_t);
+  template 
+    basic_istream<wchar_t>& 
+    getline(basic_istream<wchar_t>&, wstring&);
+#endif
+} // namespace std
 
+namespace __gnu_cxx
+{
+  template class stdio_sync_filebuf<char>;
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template class stdio_sync_filebuf<wchar_t>;
+#endif
+} // namespace __gnu_cxx