* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54351 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f7993b..960b335 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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.

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index f7f8d69..2658866 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -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

diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 71e4d88..ce90daf 100644 (file)
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -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

diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index 7ac147f..10f45ec 100644 (file)
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -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