aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jw@kayari.org>2002-10-12 06:14:31 +0000
committerPhil Edwards <pme@gcc.gnu.org>2002-10-12 06:14:31 +0000
commitb06a1ea51f22f7200b36f8bf9beda210e0a5370f (patch)
tree2e9663cef5aeeced9cdb982264a61566ef4c4272
parentc0b80fecdfa09d24579195a0719e018ced60034a (diff)
downloadgcc-b06a1ea51f22f7200b36f8bf9beda210e0a5370f.zip
gcc-b06a1ea51f22f7200b36f8bf9beda210e0a5370f.tar.gz
gcc-b06a1ea51f22f7200b36f8bf9beda210e0a5370f.tar.bz2
howto.html: Correct nasting of XHTML elements.
2002-10-12 Jonathan Wakely <jw@kayari.org> Gabriel Dos Reis <gdr@integrable-solutions.net> * docs/html/21_strings/howto.html#5: Correct nasting of XHTML elements. Correct allocator-related text. Co-Authored-By: Gabriel Dos Reis <gdr@integrable-solutions.net> From-SVN: r58080
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/docs/html/21_strings/howto.html14
2 files changed, 14 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e04ee84..e6b8cf3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-12 Jonathan Wakely <jw@kayari.org>
+ Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * docs/html/21_strings/howto.html#5: Correct nasting of XHTML
+ elements. Correct allocator-related text.
+
2002-10-11 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/static_members.cc (test02): Fix.
diff --git a/libstdc++-v3/docs/html/21_strings/howto.html b/libstdc++-v3/docs/html/21_strings/howto.html
index 4a8006d..cba9c3f 100644
--- a/libstdc++-v3/docs/html/21_strings/howto.html
+++ b/libstdc++-v3/docs/html/21_strings/howto.html
@@ -350,26 +350,28 @@
<p>That's the theory. Remember however that basic_string has additional
type parameters, which take default arguments based on the character
type (called CharT here):
- <pre>
+ </p>
+ <pre>
template &lt;typename CharT,
typename Traits = char_traits&lt;CharT&gt;,
typename Alloc = allocator&lt;CharT&gt; &gt;
class basic_string { .... };</pre>
- Now, <code>allocator&lt;CharT&gt;</code> will probably Do The Right
- Thing by default, unless you need to do something very strange with
- memory allocation in your characters.
+ <p>Now, <code>allocator&lt;CharT&gt;</code> will probably Do The Right
+ Thing by default, unless you need to implement your own allocator
+ for your characters.
</p>
<p>But <code>char_traits</code> takes more work. The char_traits
template is <em>declared</em> but not <em>defined</em>.
That means there is only
- <pre>
+ </p>
+ <pre>
template &lt;typename CharT&gt;
struct char_traits
{
static void foo (type1 x, type2 y);
...
};</pre>
- and functions such as char_traits&lt;CharT&gt;::foo() are not
+ <p>and functions such as char_traits&lt;CharT&gt;::foo() are not
actually defined anywhere for the general case. The C++ standard
permits this, because writing such a definition to fit all possible
CharT's cannot be done. (For a time, in earlier versions of GCC,