Merge [57950], [57952] to release. Fixes #3404. Fixes #3456.

[SVN r57959]
This commit is contained in:
Peter Dimov 2009-11-26 21:58:16 +00:00
parent 68714fe1ad
commit 526de844da
3 changed files with 3 additions and 3 deletions

View file

@ -622,7 +622,7 @@
<firstname>Darin</firstname>
<surname>Adler</surname>
</author>
<librarypurpose>Five smart pointer class templates</librarypurpose>
<librarypurpose>Six smart pointer class templates</librarypurpose>
<librarycategory name="category:memory"/>
</libraryinfo>
</library>

View file

@ -635,7 +635,7 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
<ul>
<li><a href="pool/doc/index.html">pool</a> - Memory pool management, from
Steve Cleary.</li>
<li><a href="smart_ptr/index.html">smart_ptr</a> - Five smart
<li><a href="smart_ptr/index.html">smart_ptr</a> - Six smart
pointer class templates, from Greg Colvin, Beman Dawes,
Peter Dimov, and Darin Adler.</li>
<li><a href="utility/utility.htm">utility</a> - Class <b>noncopyable</b>

@ -1 +1 @@
Subproject commit e94f64039d6f540d1bada3bd422f592bd8733b8c
Subproject commit 754fd941ee0c30c347eaaf77706c8a797b8fdf18