locale-inst.cc (__codecvt_abstract_base): Put inside _GLIBCPP_USE_WCHAR_T ifdef.

* src/locale-inst.cc (__codecvt_abstract_base):
	Put inside _GLIBCPP_USE_WCHAR_T ifdef.
	* include/bits/istream.tcc (basic_istream): Ditto.
	(ws) Ditto.
	(operator>>) Ditto.
	* include/bits/ostream.tcc (basic_ostream): Ditto.
	(endl): Ditto.
	(ends): Ditto.
	(flush): Ditto.
	(operator<<): Ditto.

From-SVN: r54351
This commit is contained in:
Steve Ellcey 2002-06-07 22:06:38 +00:00 committed by Loren J. Rittle
parent 6e683090d1
commit 3522a91b80
4 changed files with 18 additions and 1 deletions

View File

@ -1,3 +1,16 @@
2002-06-07 Steve Ellcey <sje@cup.hp.com>
* src/locale-inst.cc (__codecvt_abstract_base):
Put inside _GLIBCPP_USE_WCHAR_T ifdef.
* include/bits/istream.tcc (basic_istream): Ditto.
(ws) Ditto.
(operator>>) Ditto.
* include/bits/ostream.tcc (basic_ostream): Ditto.
(endl): Ditto.
(ends): Ditto.
(flush): Ditto.
(operator<<): Ditto.
2002-06-07 Phil Edwards <pme@gcc.gnu.org>
* mkcheck.in: Link against local testsuite library.

View File

@ -1221,8 +1221,10 @@ namespace std
extern template istream& operator>>(istream&, unsigned char*);
extern template istream& operator>>(istream&, signed char*);
#ifdef _GLIBCPP_USE_WCHAR_T
extern template class basic_istream<wchar_t>;
extern template wistream& ws(wistream&);
extern template wistream& operator>>(wistream&, wchar_t&);
extern template wistream& operator>>(wistream&, wchar_t*);
#endif
} // namespace std

View File

@ -694,6 +694,7 @@ namespace std
extern template ostream& operator<<(ostream&, const unsigned char*);
extern template ostream& operator<<(ostream&, const signed char*);
#ifdef _GLIBCPP_USE_WCHAR_T
extern template class basic_ostream<wchar_t>;
extern template wostream& endl(wostream&);
extern template wostream& ends(wostream&);
@ -702,4 +703,5 @@ namespace std
extern template wostream& operator<<(wostream&, char);
extern template wostream& operator<<(wostream&, const wchar_t*);
extern template wostream& operator<<(wostream&, const char*);
#endif
} // namespace std

View File

@ -181,9 +181,9 @@ namespace std
// codecvt
inline template class __codecvt_abstract_base<char, char, mbstate_t>;
inline template class __codecvt_abstract_base<wchar_t, char, mbstate_t>;
template class codecvt_byname<char, char, mbstate_t>;
#ifdef _GLIBCPP_USE_WCHAR_T
inline template class __codecvt_abstract_base<wchar_t, char, mbstate_t>;
template class codecvt_byname<wchar_t, char, mbstate_t>;
#endif