Merge trunk

[SVN r47543]

3 files changed, 64 insertions, 16 deletions

diff --git a/libs/libraries.htm b/libs/libraries.htm
index cfaea6b90a..2bca57f59b 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -35,8 +35,7 @@ content="text/html; charset=iso-8859-1">
       <a href="http://www.boost.org/users/faq.html">FAQ</a>&nbsp;&nbsp;<font color="#FFFFFF">&nbsp;
       </font>&nbsp;&nbsp;&nbsp;&nbsp; <a href="../more/index.htm">More Info</a></td>
     </tr>
-</table>
-
+  </table>
 
 <dl>
   <dt><a href="#Alphabetically">Libraries Listed Alphabetically</a></dt>
@@ -152,7 +151,7 @@ how to download, build, and install the libraries.</p>
     process-shared mutexes, condition variables, containers and allocators, from Ion Gazta&ntilde;aga</li>
     <li><a href="numeric/interval/doc/interval.htm">interval </a>- Extends the
     usual arithmetic functions to mathematical intervals, from Guillaume
-    Melquiond, Herv&acute; Br&ouml;nnimann and Sylvain Pion.</li>
+    Melquiond, Herv&eacute; Br&ouml;nnimann and Sylvain Pion.</li>
     <li><a href="intrusive/index.html">intrusive </a>- Intrusive containers and algorithms, from Ion Gazta&ntilde;aga</li>
     <li><a href="utility/in_place_factories.html">in_place_factory, typed_in_place_factory</a>- Generic in-place construction of contained objects with a variadic argument-list, from Fernando Cacciola.</li>
     <li><a href="io/doc/ios_state.html">io state savers</a> - Save I/O state to
@@ -252,6 +251,8 @@ how to download, build, and install the libraries.</p>
     Guzman, Hartmut Kaiser, Dan Nuffer and team.</li>
     <li><a href="algorithm/string/index.html">string_algo</a> -
     String algorithms library, from Pavol Droba.</li>
+    <li><a href="utility/swap.html">swap</a> -
+    Enhanced generic swap function, from Joseph Gauterin.</li>
     <li><a href="system/doc/index.html">system</a> - Operating system support, 
     including the diagnostics support that will be part of the C++0x standard 
     library, from Beman Dawes.</li>
@@ -280,6 +281,7 @@ how to download, build, and install the libraries.</p>
     <li><a href="units/index.html">units</a> -
         Zero-overhead dimensional analysis and unit/quantity
         manipulation and conversion, from Matthias Schabel and Steven Watanabe.</li>
+    <li><a href="../doc/html/unordered.html">unordered</a> - unordered associative containers, from Daniel James.</li>
     <li><a href="utility/utility.htm">utility</a> - Class <b>noncopyable</b>
         plus <b>checked_delete()</b>, <b>checked_array_delete()</b>, <b>next(),</b>&nbsp;
       <b>prior()</b>
@@ -347,6 +349,7 @@ how to download, build, and install the libraries.</p>
     <li><a href="property_map/property_map.html">property map</a>
         - Concepts defining interfaces which map key objects to
         value objects, from Jeremy Siek.</li>
+    <li><a href="../doc/html/unordered.html">unordered</a> - unordered associative containers, from Daniel James.</li>
     <li><a href="variant/index.html">variant</a> - Safe, generic, stack-based
     discriminated union container, from Eric Friedman and Itay Maman.</li>
 </ul>
@@ -466,7 +469,7 @@ how to download, build, and install the libraries.</p>
     <li><a href="type_traits/index.html">type_traits</a> -
         Templates for fundamental properties of types, from John
         Maddock, Steve Cleary, et al.</li>
-        From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
+    <li>From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
 </ul>
 
 <h3><a name="Preprocessor">Preprocessor</a> Metaprogramming</h3>
@@ -495,11 +498,12 @@ how to download, build, and install the libraries.</p>
 <ul>
     <li><a href="accumulators/index.html">accumulators</a> - Framework for incremental
         calculation, and collection of statistical accumulators, from Eric Niebler.</li>
+    <li>Cacciola.</li>
     <li><a href="integer/index.html">integer</a> - Headers to ease
         dealing with integral types.</li>
     <li><a href="numeric/interval/doc/interval.htm">interval </a>- Extends the
     usual arithmetic functions to mathematical intervals, from Guillaume
-    Melquiond, Herv? Br?nnimann and Sylvain Pion.</li>
+    Melquiond, Herv&eacute; Br&ouml;nnimann and Sylvain Pion.</li>
     <li><a href="math/doc/index.html">math</a> - Several contributions in the
     domain of mathematics, from various authors.</li>
     <li><a href="math/doc/complex/html/index.html">math/complex number algorithms</a> -
@@ -561,7 +565,7 @@ how to download, build, and install the libraries.</p>
     <li><a href="ptr_container/index.html">pointer container</a>
     - Containers for storing heap-allocated polymorphic objects to ease OO-programming, from Thorsten Ottosen. </li>
     <li><a href="tuple/doc/tuple_users_guide.html">tuple</a> - Ease definition of functions returning multiple values, and more,
-    from Jaakko Järvi.</li>
+    from Jaakko Järvi.</li>
     <li><a href="variant/index.html">variant</a> - Safe, generic, stack-based
     discriminated union container, from Eric Friedman and Itay Maman.</li>
 </ul>
@@ -581,6 +585,7 @@ how to download, build, and install the libraries.</p>
     with constant or generated data has never been
     easier, from Thorsten Ottosen.
     </li>
+
   <li><a href="format/index.html">format</a> - Type-safe 'printf-like' format
   operations, from Samuel Krempp.</li>
   <li><a href="io/doc/ios_state.html">io state savers</a> - Save I/O state to
@@ -661,6 +666,8 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
     <li><a href="statechart/doc/index.html">statechart</a> - Arbitrarily
     complex finite state machines can be implemented in easily readable and
     maintainable C++ code, from Andreas Huber.</li>
+    <li><a href="utility/swap.html">swap</a> -
+    Enhanced generic swap function, from Joseph Gauterin.</li>
     <li><a href="system/doc/index.html">system</a> - Operating 
     system support, including the diagnostics support that will be part of the 
     C++0x standard library, from Beman Dawes.</li>
diff --git a/libs/maintainers.txt b/libs/maintainers.txt
index 179d02c16c..e4f84a9211 100644
--- a/libs/maintainers.txt
+++ b/libs/maintainers.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005, 2007  Douglas Gregor <doug.gregor -at- gmail.com>
+# Distributed under the Boost Software License, Version 1.0. 
+# See www.boost.org/LICENSE_1_0.txt
+#
+# This file lists the names and e-mail addresses of the maintainers
+# of each Boost library, and is used by the regression-reporting 
+# scripts to direct e-mail related to those libraries to the 
+# maintainers. When making changes to this file, please be careful
+# to closely follow the format of the library.
+
 accumulators          Eric Niebler <eric -at- boost-consulting.com>
 algorithm/minmax      Herve Bronnimann <hbr -at- poly.edu>
 algorithm/string      Pavol Droba <droba -at- topmail.sk>
@@ -23,7 +33,8 @@ function              Douglas Gregor <dgregor -at- cs.indiana.edu>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
 functional
 functional/hash       Daniel James <daniel_james -at- fmail.co.uk>
-fusion                Joel de Guzman <joel -at- boost-consulting.com>, Dan Marsden <danmarsden -at- yahoo.co.uk>
+fusion                Joel de Guzman <joel -at- boost-consulting.com>, Dan Marsden <danmarsden -at- yahoo.co.uk>, Tobias Schwinger <tschwinger -at- isonews2.com>
+function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
 gil                   Lubomir Bourdev <lbourdev -at- adobe.com>, Hailin Jin <hljin -at- adobe.com>
 graph                 Douglas Gregor <dgregor -at- cs.indiana.edu>
 integer               Daryle Walker <darylew -at- hotmail.com>
@@ -56,7 +67,7 @@ regex                 John Maddock <john -at- johnmaddock.co.uk>
 serialization         Robert Ramey <ramey -at- rrsd.com>
 signals               Douglas Gregor <dgregor -at- cs.indiana.edu>
 smart_ptr             Beman Dawes <bdawes -at- acm.org>, Peter Dimov <pdimov -at- mmltd.net>
-spirit                Spirit Development <spirit-devel -at- lists.sourceforge.net>
+spirit                Joel de Guzman <joel -at- boost-consulting.com>, Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
 statechart            Andreas Huber <ahd6974-boostorg -at- yahoo.com>
 static_assert         John Maddock <john -at- johnmaddock.co.uk>
 test                  Gennadiy Rozental <gennadiy.rozental -at- thomson.com>
@@ -71,11 +82,9 @@ units                 Matthias Schabel <boost -at- schabel-family.org>, Steven W
 unordered             Daniel James <daniel_james -at- fmail.co.uk>
 utility
 utility/enable_if     Jaakko Jarvi <jarvi -at- cs.tamu.edu>, Jeremiah Willcock <jewillco -at- osl.iu.edu>
+utility/swap          Joseph Gauterin <joseph.gauterin -at- googlemail.com>
 variant               Eric Friedman <ericbrandon -at- gmail.com>
 wave                  Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
 xpressive             Eric Niebler <eric -at- boost-consulting.com>
 
-© Copyright Douglas Gregor 2005
-Distributed under the Boost Software License, Version 1.0. See www.boost.org/LICENSE_1_0.txt
-
 
diff --git a/libs/platform_maintainers.txt b/libs/platform_maintainers.txt
index 222ebce66b..756d77b069 100644
--- a/libs/platform_maintainers.txt
+++ b/libs/platform_maintainers.txt
@@ -1,6 +1,38 @@
-gcc-3_3-darwin	Noel Belcourt <kbelco -at- sandia.gov>
-cw-9_5-darwin	Noel Belcourt <kbelco -at- sandia.gov>
-hp_cxx-*_tru64  Markus Schöpflin <markus.schoepflin -at- comsoft.de>
+# Copyright (C) 2005, 2007  Douglas Gregor <doug.gregor -at- gmail.com>
+# Distributed under the Boost Software License, Version 1.0. 
+# See www.boost.org/LICENSE_1_0.txt
+#
+# This file lists the names and e-mail addresses of the maintainers
+# of each Boost testing platform , and is used by the regression-
+# reporting scripts to direct e-mail related to those platforms to the 
+# maintainers. When making changes to this file, please be careful
+# to closely follow the format of the library.
+#
+# The format of each line is:
+#
+# Runner      Platform      Email addresses
 
-© Copyright Douglas Gregor 2005
-Distributed under the Boost Software License, Version 1.0. See www.boost.org/LICENSE_1_0.txt
+Sandia-darwin-intel    darwin-4.0.1	       Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-darwin-ppc      darwin-4.0.1	       Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-intel           intel-linux-8.1         Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-intel           intel-linux-9.0         Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-intel           intel-linux-9.1         Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-gcc             gcc-4.2.1               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-gcc             gcc-3.4.3               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-gcc             gcc-4.0.1               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-gcc-64          gcc-4.2.1               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-gcc-64          gcc-4.1.1               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-sun             gcc-3.4.6               Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-sun             sun-5.7                 Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-sun             sun-5.8                 Noel Belcourt <kbelco -at- sandia.gov>
+Sandia-sun             sun-5.9                 Noel Belcourt <kbelco -at- sandia.gov>
+"Martin Wille x86_64"  gcc-4.2.1_linux_x86_64  Martin Wille <mw8329 -at- yahoo.com.au>
+"Martin Wille x86_64"  gcc-3.4.6_linux_x86_64  Martin Wille <mw8329 -at- yahoo.com.au>
+Huang-WinXP-x86_32     intel-vc8-win-10.0      Sean Huang <huangsean -at- hotmail.com>
+Huang-WinXP-x86_32     msvc-8.0                Sean Huang <huangsean -at- hotmail.com>
+Huang-Vista-x64        msvc-8.0_64             Sean Huang <huangsean -at- hotmail.com>
+Huang-Vista-x64        intel-vc8-win-10.0_x86_64  Sean Huang <huangsean -at- hotmail.com>
+Huang-Vista-x64        msvc-8.0_x86_64         Sean Huang <huangsean -at- hotmail.com>
+IBM_Canada_Ltd         vacpp                   Chris Cambly <ccambly -at- ca.ibm.com>
+RW_WinXP_VC            msvc-7.1                Richard Webb <richard.webb -at- boldonjames.com>
+RW_WinXP_VC            msvc-9.0                Richard Webb <richard.webb -at- boldonjames.com>