ctype_scan_char.cc: Tweak.

2002-05-13  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.

From-SVN: r53424

libstdc++-v3/ChangeLog

 2002-05-13  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-13  Benjamin Kosnik  <bkoz@redhat.com>
+
 	* include/bits/fstream.tcc
 	(basic_filebuf::_M_allocate_internal_buffer): Remove extraneous
 	try/catch blocks.

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>

libstdc++-v3/testsuite/22_locale/ctype_scan_char.cc

@@ -32,7 +32,9 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-class gnu_ctype: public std::ctype<char> { };
+typedef char char_type;
+typedef std::char_traits<char_type> traits_type;
+class gnu_ctype: public std::ctype<char_type> { };
 
 // These two macros take a ctype mask, a string and a pointer within
 // the string that the scan function should return, usually either the
@@ -40,25 +42,27 @@ class gnu_ctype: public std::ctype<char> { };
 // below.
 #define VERIFY_SCAN_IS(MASK, STRING, EXPECTED) \
   VERIFY(gctype.scan_is((MASK), (STRING), \
-			(STRING)+strlen(STRING)) == (EXPECTED))
+			(STRING) + traits_type::length(STRING)) == (EXPECTED))
 #define VERIFY_SCAN_NOT(MASK, STRING, EXPECTED) \
   VERIFY(gctype.scan_not((MASK), (STRING), \
-			 (STRING)+strlen(STRING)) == (EXPECTED))
+			 (STRING) + traits_type::length(STRING)) == (EXPECTED))
 
 // Sanity check scan_is() and scan_not().
 void test01()
 {
-  const char *const ca = "aaaaa";
-  const char *const cz = "zzzzz";
-  const char *const cA = "AAAAA";
-  const char *const cZ = "ZZZZZ";
-  const char *const c0 = "00000";
-  const char *const c9 = "99999";
-  const char *const cs = "     ";
-  const char *const xf = "fffff";
-  const char *const xF = "FFFFF";
-  const char *const p1 = "!!!!!";
-  const char *const p2 = "/////";
+  bool test = true;
+
+  const char_type *const ca = "aaaaa";
+  const char_type *const cz = "zzzzz";
+  const char_type *const cA = "AAAAA";
+  const char_type *const cZ = "ZZZZZ";
+  const char_type *const c0 = "00000";
+  const char_type *const c9 = "99999";
+  const char_type *const cs = "     ";
+  const char_type *const xf = "fffff";
+  const char_type *const xF = "FFFFF";
+  const char_type *const p1 = "!!!!!";
+  const char_type *const p2 = "/////";
   
   gnu_ctype gctype;