codecvt.html: Formatting cleanups.

2000-08-30  Benjamin Kosnik  <bkoz@redhat.com>

	* docs/22_locale/codecvt.html: Formatting cleanups.
	* src/locale.cc (ctype<wchar_t>::do_is): Fix thinko.

From-SVN: r36079

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6eec7b59057b2638ce337cdbbfe7733679b3a2ed..a703dc729bc4655e03291ab3498330dfb2c7e685 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-30  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * docs/22_locale/codecvt.html: Formatting cleanups.
+       * src/locale.cc (ctype<wchar_t>::do_is): Fix thinko.
+
 2000-08-30  Benjamin Kosnik  <bkoz@redhat.com>
 
        * bits/locale_facets.h (ctype<char>): Remove __table_type.

diff --git a/libstdc++-v3/docs/22_locale/codecvt.html b/libstdc++-v3/docs/22_locale/codecvt.html
index 9289d7dd634595a3b38ceb8de2e125f3eef9e0d5..ee05cd3cad5bdadc922607f9cb61d069671e54a2 100644 (file)
--- a/libstdc++-v3/docs/22_locale/codecvt.html
+++ b/libstdc++-v3/docs/22_locale/codecvt.html
@@ -372,7 +372,10 @@ codecvt usage.
 <H2>
 5.  Examples
 </H2>
-a. conversions involving string literals
+
+<UL>
+       <LI>
+       a. conversions involving string literals
 
 <pre>
   typedef codecvt_base::result                 result;
@@ -412,14 +415,19 @@ a. conversions involving string literals
   VERIFY( efrom_next == e_lit + size );
   VERIFY( ito_next == i_arr + size );
 </pre>
+       <LI>
        b. conversions involving std::string
+       <LI>
        c. conversions involving std::filebuf and std::ostream
+</UL>
 
 More information can be found in the following testcases:
-codecvt_char_char.cc     
-codecvt_unicode_wchar_t.cc
-codecvt_unicode_char.cc  
-codecvt_wchar_t_char.cc
+<UL>
+<LI> testsuite/22_locale/codecvt_char_char.cc  
+<LI> testsuite/22_locale/codecvt_unicode_wchar_t.cc
+<LI> testsuite/22_locale/codecvt_unicode_char.cc  
+<LI> testsuite/22_locale/codecvt_wchar_t_char.cc
+</UL>
 
 <P>
 <H2>
@@ -427,7 +435,7 @@ codecvt_wchar_t_char.cc
 </H2>
 <UL>
 <LI>
-       a. things that are sketchy, or remain unimplemented
+       a. things that are sketchy, or remain unimplemented:
                do_encoding, max_length and length member functions
                are only weakly implemented. I have no idea how to do
                this correctly, and in a generic manner.  Nathan?

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 8235dd052f87878ccbc12e21429bfc904d5b9f50..7f9a9ff2b8588d9a120385eb148c7811547b8b25 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -604,7 +604,7 @@ namespace std {
   bool
   ctype<wchar_t>::
   do_is(mask __m, char_type __c) const
-  { return static_cast<bool>(iswctype(_M_convert_to_wmask(__m), __c)); }
+  { return static_cast<bool>(iswctype(__c, _M_convert_to_wmask(__m))); }
   
   const wchar_t* 
   ctype<wchar_t>::