stl_alloc.h: Add extern implicit allocator instantiations.

2002-03-07  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/stl_alloc.h: Add extern implicit allocator
	instantiations.
	* include/bits/basic_string.tcc: Tweak.
	* include/bits/locale_facets.tcc: Remove default args. Add
	has_facet, use_facet extern instantiations.
	* src/stl-inst.cc: Add explicit instantiation.
	* src/locale-inst.cc: Clean. Remove locale member template
	instantiations.

	* testsuite/22_locale/operators.cc (test02): Enable.

From-SVN: r50426

libstdc++-v3/ChangeLog

+2002-03-07  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/stl_alloc.h: Add extern implicit allocator
+	instantiations.
+	* include/bits/basic_string.tcc: Tweak.
+	* include/bits/locale_facets.tcc: Remove default args. Add
+	has_facet, use_facet extern instantiations.
+	* src/stl-inst.cc: Add explicit instantiation.
+	* src/locale-inst.cc: Clean. Remove locale member template
+	instantiations.
+
+	* testsuite/22_locale/operators.cc (test02): Enable.
+
 2002-03-06  Benjamin Kosnik  <bkoz@redhat.com>
 	    Stephen M. Webb  <stephen.webb@bregmasoft.com>
 

libstdc++-v3/config/linker-map.gnu

@@ -37,6 +37,7 @@ GLIBCPP_3.1 {
     };
 
     # Names not in an 'extern' block are mangled names.
+    _ZSt9has_facet*;
 
     # operator new(unsigned)
     _Znwj;
@@ -101,4 +102,3 @@ CXXABI_1 {
   local:
     *;
 };
-

libstdc++-v3/include/bits/basic_string.tcc

@@ -945,7 +945,7 @@ namespace std
   // which are defined via explicit instantiations elsewhere.  
   // NB: This syntax is a GNU extension.
   extern template class basic_string<char>;
-   extern template 
+  extern template 
     basic_istream<char>& 
     operator>>(basic_istream<char>&, string&);
   extern template 

libstdc++-v3/include/bits/locale_facets.tcc

@@ -2061,36 +2061,38 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB: This syntax is a GNU extension.
+  extern template class vector<locale::facet*>;
+
   extern template class moneypunct<char, false>;
   extern template class moneypunct<char, true>;
   extern template class moneypunct_byname<char, false>;
   extern template class moneypunct_byname<char, true>;
-  extern template class money_get<char, istreambuf_iterator<char> >;
-  extern template class money_put<char, ostreambuf_iterator<char> >;
+  extern template class money_get<char>;
+  extern template class money_put<char>;
   extern template class moneypunct<wchar_t, false>;
   extern template class moneypunct<wchar_t, true>;
   extern template class moneypunct_byname<wchar_t, false>;
   extern template class moneypunct_byname<wchar_t, true>;
-  extern template class money_get<wchar_t, istreambuf_iterator<wchar_t> >;
-  extern template class money_put<wchar_t, ostreambuf_iterator<wchar_t> >;
+  extern template class money_get<wchar_t>;
+  extern template class money_put<wchar_t>;
   extern template class numpunct<char>;
   extern template class numpunct_byname<char>;
-  extern template class num_get<char, istreambuf_iterator<char> >;
-  extern template class num_put<char, ostreambuf_iterator<char> >; 
+  extern template class num_get<char>;
+  extern template class num_put<char>; 
   extern template class numpunct<wchar_t>;
   extern template class numpunct_byname<wchar_t>;
-  extern template class num_get<wchar_t, istreambuf_iterator<wchar_t> >;
-  extern template class num_put<wchar_t, ostreambuf_iterator<wchar_t> >;
+  extern template class num_get<wchar_t>;
+  extern template class num_put<wchar_t>;
   extern template class __timepunct<char>;
-  extern template class time_put<char, ostreambuf_iterator<char> >;
-  extern template class time_put_byname<char, ostreambuf_iterator<char> >;
-  extern template class time_get<char, istreambuf_iterator<char> >;
-  extern template class time_get_byname<char, istreambuf_iterator<char> >;
+  extern template class time_put<char>;
+  extern template class time_put_byname<char>;
+  extern template class time_get<char>;
+  extern template class time_get_byname<char>;
   extern template class __timepunct<wchar_t>;
-  extern template class time_put<wchar_t, ostreambuf_iterator<wchar_t> >;
-  extern template class time_put_byname<wchar_t, ostreambuf_iterator<wchar_t> >;
-  extern template class time_get<wchar_t, istreambuf_iterator<wchar_t> >;
-  extern template class time_get_byname<wchar_t, istreambuf_iterator<wchar_t> >;
+  extern template class time_put<wchar_t>;
+  extern template class time_put_byname<wchar_t>;
+  extern template class time_get<wchar_t>;
+  extern template class time_get_byname<wchar_t>;
   extern template class messages<char>;
   extern template class messages_byname<char>;
   extern template class messages<wchar_t>;
@@ -2103,13 +2105,217 @@ namespace std
   extern template class collate_byname<char>;
   extern template class collate<wchar_t>;
   extern template class collate_byname<wchar_t>;
-} // namespace std
 
-#endif
+  extern template
+    const codecvt<char, char, mbstate_t>& 
+    use_facet<codecvt<char, char, mbstate_t> >(const locale&);
+
+  extern template
+    const collate<char>& 
+    use_facet<collate<char> >(const locale&);
+
+  extern template
+    const numpunct<char>& 
+    use_facet<numpunct<char> >(const locale&);
+
+  extern template 
+    const num_put<char>& 
+    use_facet<num_put<char> >(const locale&);
+
+  extern template 
+    const num_get<char>& 
+    use_facet<num_get<char> >(const locale&);
+
+  extern template
+    const moneypunct<char, true>& 
+    use_facet<moneypunct<char, true> >(const locale&);
+
+  extern template
+    const moneypunct<char, false>& 
+    use_facet<moneypunct<char, false> >(const locale&);
+
+  extern template 
+    const money_put<char>& 
+    use_facet<money_put<char> >(const locale&);
+
+  extern template 
+    const money_get<char>& 
+    use_facet<money_get<char> >(const locale&);
+
+  extern template
+    const __timepunct<char>& 
+    use_facet<__timepunct<char> >(const locale&);
+
+  extern template 
+    const time_put<char>& 
+    use_facet<time_put<char> >(const locale&);
+
+  extern template 
+    const time_get<char>& 
+    use_facet<time_get<char> >(const locale&);
+
+  extern template 
+    const messages<char>& 
+    use_facet<messages<char> >(const locale&);
+
+  extern template
+    const codecvt<wchar_t, char, mbstate_t>& 
+    use_facet<codecvt<wchar_t, char, mbstate_t> >(locale const&);
+
+  extern template
+    const collate<wchar_t>& 
+    use_facet<collate<wchar_t> >(const locale&);
+
+  extern template
+    const numpunct<wchar_t>& 
+    use_facet<numpunct<wchar_t> >(const locale&);
+
+  extern template 
+    const num_put<wchar_t>& 
+    use_facet<num_put<wchar_t> >(const locale&);
+
+  extern template 
+    const num_get<wchar_t>& 
+    use_facet<num_get<wchar_t> >(const locale&);
 
+  extern template
+    const moneypunct<wchar_t, true>& 
+    use_facet<moneypunct<wchar_t, true> >(const locale&);
 
+  extern template
+    const moneypunct<wchar_t, false>& 
+    use_facet<moneypunct<wchar_t, false> >(const locale&);
+ 
+  extern template 
+    const money_put<wchar_t>& 
+    use_facet<money_put<wchar_t> >(const locale&);
+
+  extern template 
+    const money_get<wchar_t>& 
+    use_facet<money_get<wchar_t> >(const locale&);
+
+  extern template
+    const __timepunct<wchar_t>& 
+    use_facet<__timepunct<wchar_t> >(const locale&);
+
+  extern template 
+    const time_put<wchar_t>& 
+    use_facet<time_put<wchar_t> >(const locale&);
+
+  extern template 
+    const time_get<wchar_t>& 
+    use_facet<time_get<wchar_t> >(const locale&);
+
+  extern template 
+    const messages<wchar_t>& 
+    use_facet<messages<wchar_t> >(const locale&);
+
+
+  extern template 
+    bool
+    has_facet<ctype<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<codecvt<char, char, mbstate_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<collate<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<numpunct<char> >(const locale&);
 
+  extern template 
+    bool
+    has_facet<num_put<char> >(const locale&);
 
+  extern template 
+    bool
+    has_facet<num_get<char> >(const locale&);
 
+  extern template 
+    bool
+    has_facet<moneypunct<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<money_put<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<money_get<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<__timepunct<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<time_put<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<time_get<char> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<messages<char> >(const locale&);
+
+ extern template 
+    bool
+    has_facet<ctype<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<codecvt<wchar_t, char, mbstate_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<collate<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<numpunct<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<num_put<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<num_get<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<moneypunct<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<money_put<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<money_get<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<__timepunct<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<time_put<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<time_get<wchar_t> >(const locale&);
+
+  extern template 
+    bool
+    has_facet<messages<wchar_t> >(const locale&);
+} // namespace std
+
+#endif
 
 

libstdc++-v3/include/bits/stl_alloc.h

@@ -922,6 +922,11 @@ struct _Alloc_traits<_Tp, __allocator<_Tp1, __debug_alloc<_Alloc> > >
 };
 //@}
 
+  // Inhibit implicit instantiations for required instantiations,
+  // which are defined via explicit instantiations elsewhere.  
+  // NB: This syntax is a GNU extension.
+  extern template class allocator<char>;
+  extern template class allocator<wchar_t>;
 } // namespace std
 
 #endif /* __GLIBCPP_INTERNAL_ALLOC_H */

libstdc++-v3/src/locale.cc

@@ -63,7 +63,7 @@ namespace std
   const size_t 			locale::_S_num_categories;
   const size_t 			locale::_S_num_facets;
 
-  // Definitions for locale::id of standard facets. 
+  // Definitions for locale::id of standard facets that are specialized.
   locale::id ctype<char>::id;
   locale::id codecvt<char, char, mbstate_t>::id;
 

libstdc++-v3/src/stl-inst.cc

@@ -34,11 +34,12 @@
 #include <bits/c++config.h>
 #include <memory>
 #include <vector>
-#include <ostream>
-#include <map>
 
 namespace std
 {
+  template class allocator<char>;
+  template class allocator<wchar_t>;
+
   template class __malloc_alloc_template<0>;
 
 #ifndef __USE_MALLOC

libstdc++-v3/testsuite/22_locale/operators.cc

 // 2000-09-11 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002 Free Software Foundation
 //
 // 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
@@ -47,9 +47,9 @@ void test01()
 }
 
 // bool operator()(const string_type&, const string_type&) const
-typedef std::collate<char> ccollate;
 long gnu_count;
-class gnu_collate: public ccollate 
+
+class gnu_collate: public std::collate<char>
 { 
 protected:
   virtual int
@@ -79,7 +79,7 @@ void test02()
 int main ()
 {
   test01();
-
+  test02();
   return 0;
 }