From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Sat, 18 May 2002 14:42:49 +0000 (+0000)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-3.1.1~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1058a0e2a38bc058ee7b7afd4770597f2a5bfc;p=thirdparty%2Fgcc.git

[multiple changes]


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

	* testsuite/22_locale/ctype_scan_char.cc: Tweak.
	* testsuite/22_locale/ctype_scan_wchar_t.cc: New.

	* docs/html/install.html: Fix.

2002-05-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* config/os/irix/irix5.2/bits/ctype_inline.h (scan_is, scan_not):
	Fix typo, use this->is() rather than manually (and perhaps
	incorrectly) inlining it.
	* config/os/irix/irix6.5/bits/ctype_inline.h (scan_is, scan_not):
	Likewise.
	* testsuite/22_locale/ctype_scan_char.cc: New file.

From-SVN: r53584
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f31037f54c88..511febee833a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,19 @@
+2002-05-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/22_locale/ctype_scan_char.cc: Tweak.
+	* testsuite/22_locale/ctype_scan_wchar_t.cc: New.	
+
+	* docs/html/install.html: Fix.
+
+2002-05-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* config/os/irix/irix5.2/bits/ctype_inline.h (scan_is, scan_not):
+	Fix typo, use this->is() rather than manually (and perhaps
+	incorrectly) inlining it.
+	* config/os/irix/irix6.5/bits/ctype_inline.h (scan_is, scan_not):
+	Likewise.
+	* testsuite/22_locale/ctype_scan_char.cc: New file.
+
 2002-05-18  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/fstream.tcc
diff --git a/libstdc++-v3/config/os/irix/irix5.2/bits/ctype_inline.h b/libstdc++-v3/config/os/irix/irix5.2/bits/ctype_inline.h
index 400b3a7c391e..89cf11b259b0 100644
--- a/libstdc++-v3/config/os/irix/irix5.2/bits/ctype_inline.h
+++ b/libstdc++-v3/config/os/irix/irix5.2/bits/ctype_inline.h
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -37,14 +37,14 @@
   bool
   ctype<char>::
   is(mask __m, char __c) const
-  { return (_M_table)[__c] & __m; }
+  { return (_M_table)[static_cast<unsigned char>(__c)] & __m; }
 
   const char*
   ctype<char>::
   is(const char* __low, const char* __high, mask* __vec) const
   {
     while (__low < __high)
-      *__vec++ = (_M_table)[*__low++];
+      *__vec++ = (_M_table)[static_cast<unsigned char>(*__low++)];
     return __high;
   }
 
@@ -52,7 +52,7 @@
   ctype<char>::
   scan_is(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high && !((_M_table)[*__low] & __m))
+    while (__low < __high && ! this->is(__m, *__low))
       ++__low;
     return __low;
   }
@@ -61,12 +61,7 @@
   ctype<char>::
   scan_not(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high && ((_M_table + 1)[*__low] & __m) != 0)
+    while (__low < __high && this->is(__m, *__low))
       ++__low;
     return __low;
   }
-
-
-
-
-
diff --git a/libstdc++-v3/config/os/irix/irix6.5/bits/ctype_inline.h b/libstdc++-v3/config/os/irix/irix6.5/bits/ctype_inline.h
index b7ab12dbf146..8c10c4d17ff0 100644
--- a/libstdc++-v3/config/os/irix/irix6.5/bits/ctype_inline.h
+++ b/libstdc++-v3/config/os/irix/irix6.5/bits/ctype_inline.h
@@ -52,8 +52,7 @@
   ctype<char>::
   scan_is(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high 
-	   && !((_M_table)[static_cast<unsigned char>(*__low)] & __m))
+    while (__low < __high && ! this->is(__m, *__low))
       ++__low;
     return __low;
   }
@@ -62,8 +61,7 @@
   ctype<char>::
   scan_not(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high 
-	   && ((_M_table + 1)[static_cast<unsigned char>(*__low)] & __m) != 0)
+    while (__low < __high && this->is(__m, *__low))
       ++__low;
     return __low;
   }
diff --git a/libstdc++-v3/docs/html/install.html b/libstdc++-v3/docs/html/install.html
index c2ec0305a9d9..ff351049b98f 100644
--- a/libstdc++-v3/docs/html/install.html
+++ b/libstdc++-v3/docs/html/install.html
@@ -113,10 +113,14 @@
 	  <p> <code> rpm -e glibc-common --nodeps </code> </p>
 	  <p> <code> rpm -i --define "_install_langs all" 
 	  glibc-common-2.2.5-34.i386.rpm </code> </p>
- 	  <li> install just the necessary locales
+	  </li> 
+	  <li> install just the necessary locales
 	  <p> <code> localedef -i de_DE -f ISO-8859-1 de_DE </code> </p>
-         </p>
-      </dl>
+	  </li> 
+        </p>
+	</dd>
+      </dt>
+    </dl>
    </p>
 
 <hr>