diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-02-08 12:59:49 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-02-08 12:59:49 +0000 |
| commit | e7d7a7a734759ee8189dfcd780a6d659af115f80 (patch) | |
| tree | df43229ce335aaaac918c73f1b098710eed6acbe | |
| parent | 19afc459e63b079972e71bbad05ae2452452fdba (diff) | |
| download | gcc-e7d7a7a734759ee8189dfcd780a6d659af115f80.zip gcc-e7d7a7a734759ee8189dfcd780a6d659af115f80.tar.gz gcc-e7d7a7a734759ee8189dfcd780a6d659af115f80.tar.bz2 | |
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.
From-SVN: r49614
| -rw-r--r-- | libstdc++-v3/ChangeLog | 12 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.h | 24 |
3 files changed, 12 insertions, 26 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4786fce..448f9af 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +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. + 2002-02-08 Phil Edwards <pme@gcc.gnu.org> * docs/doxygen/TODO: Update. diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index 4ef0bcc..72dadc4 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -277,7 +277,6 @@ namespace std 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); @@ -431,7 +430,6 @@ namespace std _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); diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 052b1bd..c00e17c 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -529,12 +529,6 @@ namespace std 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); @@ -1144,18 +1138,6 @@ namespace std 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 @@ -1456,12 +1438,6 @@ namespace std 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 moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc); |