re PR libstdc++/6795 (stringbuf failure)

2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/6795.
	* config/os/solaris/solaris2.6/bits/ctype_noninline.h
	(classic_table): Fix.
	* config/os/solaris/solaris2.5/bits/ctype_noninline.h: Same.

2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/22_locale/ctype_is_wchar_t.cc: Guard with
	_GLIBCPP_USE_WCHAR_T.
	* testsuite/22_locale/ctype_narrow_wchar_t.cc: Same.
	* testsuite/22_locale/ctype_to_wchar_t.cc: Same.
	* testsuite/22_locale/ctype_widen_wchar_t.cc: Same.

From-SVN: r53921

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 233734efb94654f3bbfef8da82906b98c043c0a6..ac445d5ce094b7cbcd4e23d30f12d1910d16759f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>
+
+       PR libstdc++/6795.
+       * config/os/solaris/solaris2.6/bits/ctype_noninline.h
+       (classic_table): Fix.
+       * config/os/solaris/solaris2.5/bits/ctype_noninline.h: Same.
+       
+2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/22_locale/ctype_is_wchar_t.cc: Guard with
+       _GLIBCPP_USE_WCHAR_T.
+       * testsuite/22_locale/ctype_narrow_wchar_t.cc: Same.
+       * testsuite/22_locale/ctype_to_wchar_t.cc: Same.
+       * testsuite/22_locale/ctype_widen_wchar_t.cc: Same.
+       
 2002-05-26  Carlo Wood  <carlo@alinoe.com>
             Paolo Carlini  <pcarlini@unitus.it>
 

diff --git a/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h b/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
index f466afbc1cee643ae926db94fab56fa0d8d02f26..a3c27b06b87dcc754578d53562a21a992475c886 100644 (file)
--- a/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
@@ -35,7 +35,7 @@
 
   const ctype_base::mask*
   ctype<char>::classic_table() throw()
-  { return 0; }
+  { return __ctype; }
 
   ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
                     size_t __refs) 

diff --git a/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h b/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
index b22ad9a137433ffd3ee92b7c0b1d723dde1f28c9..f65cfe70f79f2d072c30724c3c18b2cb284e0e1c 100644 (file)
--- a/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
@@ -35,7 +35,7 @@
   
   const ctype_base::mask*
   ctype<char>::classic_table() throw()
-  { return 0; }  
+  { return __ctype_mask; }  
 
   ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
                     size_t __refs) 

diff --git a/libstdc++-v3/testsuite/22_locale/ctype_is_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/ctype_is_wchar_t.cc
index 9e6271dd4dab8a0f5d95b81f8075a0206be6f097..50aa0dcdf1a68d04d73cb89152e7a0faeadd7c93 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype_is_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_is_wchar_t.cc
@@ -34,6 +34,7 @@
 // XXX This test (test02) is not working for non-glibc locale models.
 // { dg-do run { xfail *-*-* } }
 
+#ifdef _GLIBCPP_USE_WCHAR_T
 typedef wchar_t char_type;
 class gnu_ctype: public std::ctype<char_type> { };
 
@@ -183,11 +184,14 @@ void test05()
       VERIFY( preLANG == postLANG );
     }
 }
+#endif
 
 int main() 
 {
+#ifdef _GLIBCPP_USE_WCHAR_T
   test01();
   test04();
   test05();
+#endif
   return 0;
 }

diff --git a/libstdc++-v3/testsuite/22_locale/ctype_narrow_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/ctype_narrow_wchar_t.cc
index 95946a760342b60bb77b9ae11b899ceb108b22cb..18745b9e3a47159f2fe9c8753bf8ee098fe61284 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype_narrow_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_narrow_wchar_t.cc
@@ -33,6 +33,7 @@
 #include <vector>
 #include <testsuite_hooks.h>
 
+#ifdef _GLIBCPP_USE_WCHAR_T
 // libstdc++/6701
 void test01()
 {
@@ -94,10 +95,13 @@ void test02()
   for (int i = 0; i < wide.length(); ++i)
     VERIFY( narrow_chars[i] == narrow[i] );
 }
+#endif
 
 int main() 
 {
+#ifdef _GLIBCPP_USE_WCHAR_T
   test01();
   test02();
-  return 0;
+#endif
+ return 0;
 }

diff --git a/libstdc++-v3/testsuite/22_locale/ctype_to_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/ctype_to_wchar_t.cc
index ccc3d87dea094dcc9ffa6bf7574b678bc64dca94..70ca529826e79893b9c04452ed90c46d5b53254b 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype_to_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_to_wchar_t.cc
@@ -30,6 +30,7 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
+#ifdef _GLIBCPP_USE_WCHAR_T
 typedef wchar_t char_type;
 class gnu_ctype: public std::ctype<char_type> { };
 
@@ -130,11 +131,14 @@ void test05()
       VERIFY( preLANG == postLANG );
     }
 }
+#endif
 
 int main() 
 {
+#ifdef _GLIBCPP_USE_WCHAR_T
   test01();
   test04();
   test05();
+#endif
   return 0;
 }

diff --git a/libstdc++-v3/testsuite/22_locale/ctype_widen_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/ctype_widen_wchar_t.cc
index f089a06e3eddc1b8c365d55b7d48dadd7d516368..d07a58d2201ff9904a7ba2eb9d758d9c3d79f907 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype_widen_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype_widen_wchar_t.cc
@@ -33,6 +33,7 @@
 #include <vector>
 #include <testsuite_hooks.h>
 
+#ifdef _GLIBCPP_USE_WCHAR_T
 void test01()
 {
   using namespace std;
@@ -59,9 +60,12 @@ void test01()
   for (int i = 0; i < narrow.length(); ++i)
     VERIFY( wide_chars[i] == wide[i] );
 }
+#endif
 
 int main() 
 {
+#ifdef _GLIBCPP_USE_WCHAR_T
   test01();
+#endif
   return 0;
 }