Merge inspection failure fixes from Trunk.

[SVN r43634]
This commit is contained in:
John Maddock 2008-03-15 18:45:28 +00:00
parent ab479794f3
commit 9b52e49fda
3 changed files with 23 additions and 31 deletions

View File

@ -740,26 +740,16 @@ specialisation).</p>
<p>Revised 01 September 2000</p> <p>Revised 01 September 2000</p>
<p>© Copyright boost.org 2000. Permission to copy, use, modify, <p>
sell and distribute this document is granted provided this Copyright 2000 Steve Cleary, Beman Dawes, Howard
copyright notice appears in all copies. This document is provided Hinnant and John Maddock. <br/>
&quot;as is&quot; without express or implied warranty, and with Use, modification and distribution are subject to the
no claim as to its suitability for any purpose.</p> Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt
<p>Based on contributions by Steve Cleary, Beman Dawes, Howard or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
Hinnant and John Maddock.</p> http://www.boost.org/LICENSE_1_0.txt
</a>).
<p>Maintained by <a href="mailto:john@johnmaddock.co.uk">John </p>
Maddock</a>, the latest version of this file can be found at <a
href="http://www.boost.org/">www.boost.org</a>, and the boost
discussion list at <a
href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.</p>
<p>.</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
</body> </body>
</html> </html>

View File

@ -366,17 +366,18 @@ David Vandevoorde and Nicolai&nbsp;M. Josuttis.
<EM>C++ Templates: The Complete Guide</EM>. <EM>C++ Templates: The Complete Guide</EM>.
Addison-Wesley, 2002.</DL> Addison-Wesley, 2002.</DL>
<hr/>
<p>Copyright Jaakko J&auml;rvi, Jeremiah Willcock and Andrew Lumsdaine<BR>
<hr></hr>
<B>Contributed by:</B> <BR>
Jaakko J&auml;rvi, Jeremiah Willcock and Andrew Lumsdaine<BR>
<EM>{jajarvi|jewillco|lums}@osl.iu.edu</EM><BR> <EM>{jajarvi|jewillco|lums}@osl.iu.edu</EM><BR>
Indiana University<BR> Indiana University<BR>
Open Systems Lab Open Systems Lab<br/>
Use, modification and distribution are subject to the
Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt
or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
http://www.boost.org/LICENSE_1_0.txt
</a>).
</p>
<!--HTMLFOOT--> <!--HTMLFOOT-->
<!--ENDHTML--> <!--ENDHTML-->
<!--FOOTER--> <!--FOOTER-->

View File

@ -21,14 +21,15 @@
<a href="compressed_pair.htm">compressed_pair</a><br> <a href="compressed_pair.htm">compressed_pair</a><br>
<a href="current_function.html">current_function</a><br> <a href="current_function.html">current_function</a><br>
<a href="enable_if.html">enable_if</a><br> <a href="enable_if.html">enable_if</a><br>
<a href="iterator_adaptors.htm">iterator_adaptors</a><br> <a href="iterator_adaptors.htm">iterator_adaptors</a><br>
<a href="generator_iterator.htm">generator iterator adaptors</a><br>
<a href="operators.htm">operators</a><br> <a href="operators.htm">operators</a><br>
<a href="throw_exception.html">throw_exception</a><br> <a href="throw_exception.html">throw_exception</a><br>
<a href="utility.htm">utility</a><br> <a href="utility.htm">utility</a><br>
<a href="value_init.htm">value_init</a></p> <a href="value_init.htm">value_init</a></p>
</blockquote> </blockquote>
<hr> <hr>
<p>© Copyright Beman Dawes, 2001</p> <p>© Copyright Beman Dawes, 2001</p>
<p>Distributed under the Boost Software License, Version 1.0. (See <p>Distributed under the Boost Software License, Version 1.0. (See
accompanying file <a href="../../LICENSE_1_0.txt"> accompanying file <a href="../../LICENSE_1_0.txt">
LICENSE_1_0.txt</a> or copy at LICENSE_1_0.txt</a> or copy at