Fixed conflicts in 1.28.0 merge

[SVN r13946]
This commit is contained in:
Douglas Gregor
2002-05-16 02:18:29 +00:00
parent e975d1e0c2
commit d50e9729ea
3 changed files with 13 additions and 27 deletions

View File

@ -96,7 +96,7 @@ object. This is often referred to as "argument binding", and is beyond the scope
f(5); // Call x.foo(5)</pre></li>
<li><a href="../../lambda/doc/index.html">Boost.Lambda</a>. This library provides a powerful composition mechanism to construct function objects that uses very natural C++ syntax. Lambda requires a compiler that is reasonably conformant to the C++ standard.</li>
<li><a href="../../lambda/doc/index.html">The Boost.Lambda library</a>. This library provides a powerful composition mechanism to construct function objects that uses very natural C++ syntax. Lambda requires a compiler that is reasonably conformant to the C++ standard. </li>
</ul>
<h3>References to Functions</h3>
@ -199,7 +199,7 @@ boost::function2&lt;float, int, int, SynchronizedPolicy, SynchronizedMixin&gt; f
<address><a href="mailto:gregod@cs.rpi.edu">Douglas Gregor</a></address>
<!-- Created: Fri Jul 13 12:47:11 EDT 2001 -->
<!-- hhmts start -->
Last modified: Mon May 13 08:36:01 EDT 2002
Last modified: Wed May 15 22:20:19 EDT 2002
<!-- hhmts end -->
</body>
</html>