Another obvious fix

Steve Ellcey sje@cup.hp.com
Thu Jun 6 14:44:00 GMT 2002


I believe this is another obvious fix to put wchar_t references inside
of _GLIBCPP_USE_WCHAR_T ifdefs, I don't have write permission so I can't
check it in.

Steve Ellcey
sje@cup.hp.com



2002-06-06  Steve Ellcey  <sje@cup.hp.com>
	* gcc/libstdc++-v3/include/bits/istream.tcc (basic_istream): Put
	wchar_t version inside ifdef _GLIBCPP_USE_WCHAR_T.
	(ws) Ditto.
	(operator>>) Ditto.
	* gcc/libstdc++-v3/include/bits/ostream.tcc (basic_ostream): Ditto. 
	(endl): Ditto.
	(ends): Ditto.
	(flush): Ditto.
	(operator<<): Ditto.


*** gcc.orig/libstdc++-v3/include/bits/istream.tcc	Thu Jun  6 14:35:01 2002
--- gcc/libstdc++-v3/include/bits/istream.tcc	Thu Jun  6 14:35:37 2002
*************** namespace std 
*** 1221,1228 ****
--- 1221,1230 ----
    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
*** gcc.orig/libstdc++-v3/include/bits/ostream.tcc	Thu Jun  6 14:35:04 2002
--- gcc/libstdc++-v3/include/bits/ostream.tcc	Thu Jun  6 14:37:32 2002
*************** namespace std 
*** 694,699 ****
--- 694,700 ----
    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&);
*************** namespace std 
*** 702,705 ****
--- 703,707 ----
    extern template wostream& operator<<(wostream&, char);
    extern template wostream& operator<<(wostream&, const wchar_t*);
    extern template wostream& operator<<(wostream&, const char*);
+ #endif
  } // namespace std



More information about the Libstdc++ mailing list