[v3] remove generic defintions, duplicate typedefs

[Benjamin Kosnik]

tested x86/linux

2002-02-08   Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.h
	(numpunct<_CharT>::_M_initialize_numpunct): Remove definition.
	(__timepunct<_CharT>::_M_initialize_timepunct): Same.
	(__timepunct<_CharT>::_M_put_helper): Same.
	(moneypunct<_CharT, _Intl>::_M_initialize_moneypunct): Same.

	* include/bits/fstream.tcc (filebuf::underflow): Remove
	__codecvt_type typedef.
	(filebuf::_M_convert_to_external): Same.
	

Index: include/bits/fstream.tcc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/fstream.tcc,v
retrieving revision 1.22
diff -c -p -r1.22 fstream.tcc
*** fstream.tcc	2002/02/08 01:34:40	1.22
--- fstream.tcc	2002/02/08 12:48:42
*************** namespace std
*** 277,283 ****
  
  	  if (__testinit || __testget)
  	    {
- 	      typedef codecvt<char_type, char, __state_type> __codecvt_type;
  	      const locale __loc = this->getloc();
  	      const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc); 
  
--- 277,282 ----
*************** namespace std
*** 431,437 ****
      _M_convert_to_external(_CharT* __ibuf, streamsize __ilen,
  			   streamsize& __elen, streamsize& __plen)
      {
-       typedef codecvt<char_type, char, __state_type> __codecvt_type;
        const locale __loc = this->getloc();
        const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc);
        
--- 430,435 ----
Index: include/bits/locale_facets.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/locale_facets.h,v
retrieving revision 1.40
diff -c -p -r1.40 locale_facets.h
*** locale_facets.h	2002/01/23 20:38:59	1.40
--- locale_facets.h	2002/02/08 12:48:46
*************** namespace std
*** 529,540 ****
    template<typename _CharT>
      locale::id numpunct<_CharT>::id;
  
-   // NB: Cannot be made generic. 
-   template<typename _CharT>
-     void
-     numpunct<_CharT>::_M_initialize_numpunct(__c_locale)
-     { }
- 
    template<> 
      void
      numpunct<char>::_M_initialize_numpunct(__c_locale __cloc);
--- 529,534 ----
*************** namespace std
*** 1144,1162 ****
    template<typename _CharT>
      const _CharT* __timepunct<_CharT>::_S_timezones[14];
  
-   // NB: Cannot be made generic. 
-   template<typename _CharT>
-     void
-     __timepunct<_CharT>::_M_initialize_timepunct(__c_locale)
-     { }
  
-   // NB: Cannot be made generic.
-   template<typename _CharT>
-     void
-     __timepunct<_CharT>::_M_put_helper(_CharT*, size_t, const _CharT*, 
- 				       const tm*) const
-     { }
- 
    template<typename _CharT, typename _InIter>
      class time_get : public locale::facet, public time_base
      {
--- 1138,1144 ----
*************** namespace std
*** 1455,1466 ****
  
    template<typename _CharT, bool _Intl>
      const bool moneypunct<_CharT, _Intl>::intl;
- 
-   // NB: Cannot be made generic. 
-   template<typename _CharT, bool _Intl>
-     void
-     moneypunct<_CharT, _Intl>::_M_initialize_moneypunct(__c_locale)
-     { }
  
    template<> 
      void
--- 1437,1442 ----