[range] merge doc fixes (r81888, r81889) from trunk

[SVN r82138]
This commit is contained in:
Nathan Ridge committed 2012-12-21 08:44:32 +00:00
1 parent bda0d613c1
commit a417560f09
165 files changed
+2312 -2240

No files matched your search

+9 -9
View File
@@ -22,7 +22,7 @@
<div class="spirit-nav">
<a accesskey="p" href="sub_range.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../utilities.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../extending.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="section range_reference_utilities_join">
<div class="titlepage"><div><div><h4 class="title">
<a name="range.reference.utilities.join"></a><a class="link" href="join.html" title="Function join">Function join</a>
</h4></div></div></div>
@@ -38,12 +38,11 @@
Note that the joined range incurs a performance cost due to the need to
check if the end of a range has been reached internally during traversal.
</p>
<a name="range.reference.utilities.join.synposis"></a><h5>
<a name="id764138"></a>
<a class="link" href="join.html#range.reference.utilities.join.synposis">Synposis</a>
<h5>
<a name="range.reference.utilities.join.h0"></a>
<span><a name="range.reference.utilities.join.synposis"></a></span><a class="link" href="join.html#range.reference.utilities.join.synposis">Synposis</a>
</h5>
<p>
</p>
<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">SinglePassRange1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">SinglePassRange2</span><span class="special">&gt;</span>
<span class="identifier">joined_range</span><span class="special">&lt;</span><span class="keyword">const</span> <span class="identifier">SinglePassRange1</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">SinglePassRange2</span><span class="special">&gt;</span>
@@ -107,9 +106,9 @@
and <code class="computeroutput"><span class="identifier">rng2</span></code>.
</li>
</ul></div>
<a name="range.reference.utilities.join.example"></a><h5>
<a name="id764973"></a>
<a class="link" href="join.html#range.reference.utilities.join.example">Example</a>
<h5>
<a name="range.reference.utilities.join.h1"></a>
<span><a name="range.reference.utilities.join.example"></a></span><a class="link" href="join.html#range.reference.utilities.join.example">Example</a>
</h5>
<p>
The expression <code class="computeroutput"><span class="identifier">join</span><span class="special">(</span><span class="identifier">irange</span><span class="special">(</span><span class="number">0</span><span class="special">,</span><span class="number">5</span><span class="special">),</span> <span class="identifier">irange</span><span class="special">(</span><span class="number">5</span><span class="special">,</span><span class="number">10</span><span class="special">))</span></code> would
@@ -118,7 +117,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
<td align="right"><div class="copyright-footer">Copyright &#169; 2003 -2010 Thorsten Ottosen, Neil Groves<p>
<td align="right"><div class="copyright-footer">Copyright &#169; 2003-2010 Thorsten Ottosen,
Neil Groves<p>
Distributed under 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" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
</p>