feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

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

Browse Source 
[SVN r82138]
This commit is contained in:
Nathan Ridge
2012-12-21 08:44:32 +00:00
parent bda0d613c1
commit a417560f09
165 changed files with 2312 additions and 2240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
doc/html/range/reference/algorithms/mutating/merge.html
View File

@ -22,16 +22,15 @@
<div class="spirit-nav">
<a accesskey="p" href="inplace_merge.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../mutating.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="nth_element.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="section range_reference_algorithms_mutating_merge">
<div class="titlepage"><div><div><h5 class="title">
<a name="range.reference.algorithms.mutating.merge"></a><a class="link" href="merge.html" title="merge">merge</a>
</h5></div></div></div>
<a name="range.reference.algorithms.mutating.merge.prototype"></a><h6>
<a name="id688803"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.prototype">Prototype</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h0"></a>
<span><a name="range.reference.algorithms.mutating.merge.prototype"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.prototype">Prototype</a>
</h6>
<p>
</p>
<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
<span class="keyword">class</span> <span class="identifier">SinglePassRange1</span><span class="special">,</span>
@ -55,9 +54,9 @@
</pre>
<p>
</p>
<a name="range.reference.algorithms.mutating.merge.description"></a><h6>
<a name="id689149"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.description">Description</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h1"></a>
<span><a name="range.reference.algorithms.mutating.merge.description"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.description">Description</a>
</h6>
<p>
<code class="computeroutput"><span class="identifier">merge</span></code> combines two sorted
@ -74,16 +73,16 @@
The non-predicate version uses the <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;()</span></code> for the range value type. The predicate
version uses the predicate instead of <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;()</span></code>.
</p>
<a name="range.reference.algorithms.mutating.merge.definition"></a><h6>
<a name="id689324"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.definition">Definition</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h2"></a>
<span><a name="range.reference.algorithms.mutating.merge.definition"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.definition">Definition</a>
</h6>
<p>
Defined in the header file <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">range</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">merge</span><span class="special">.</span><span class="identifier">hpp</span></code>
</p>
<a name="range.reference.algorithms.mutating.merge.requirements"></a><h6>
<a name="id689393"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.requirements">Requirements</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h3"></a>
<span><a name="range.reference.algorithms.mutating.merge.requirements"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.requirements">Requirements</a>
</h6>
<p>
<span class="bold"><strong>For the non-predicate version:</strong></span>
@ -149,13 +148,13 @@
set of value types.
</li>
</ul></div>
<a name="range.reference.algorithms.mutating.merge.precondition_"></a><h6>
<a name="id689915"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.precondition_">Precondition:</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h4"></a>
<span><a name="range.reference.algorithms.mutating.merge.precondition_"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.precondition_">Precondition:</a>
</h6>
<a name="range.reference.algorithms.mutating.merge.for_the_non_predicate_version_"></a><h6>
<a name="id689935"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.for_the_non_predicate_version_">For
<h6>
<a name="range.reference.algorithms.mutating.merge.h5"></a>
<span><a name="range.reference.algorithms.mutating.merge.for_the_non_predicate_version_"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.for_the_non_predicate_version_">For
the non-predicate version:</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
@ -193,9 +192,9 @@
is a valid range.
</li>
</ul></div>
<a name="range.reference.algorithms.mutating.merge.for_the_predicate_version_"></a><h6>
<a name="id690400"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.for_the_predicate_version_">For
<h6>
<a name="range.reference.algorithms.mutating.merge.h6"></a>
<span><a name="range.reference.algorithms.mutating.merge.for_the_predicate_version_"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.for_the_predicate_version_">For
the predicate version:</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
@ -229,9 +228,9 @@
is a valid range.
</li>
</ul></div>
<a name="range.reference.algorithms.mutating.merge.complexity"></a><h6>
<a name="id690889"></a>
<a class="link" href="merge.html#range.reference.algorithms.mutating.merge.complexity">Complexity</a>
<h6>
<a name="range.reference.algorithms.mutating.merge.h7"></a>
<span><a name="range.reference.algorithms.mutating.merge.complexity"></a></span><a class="link" href="merge.html#range.reference.algorithms.mutating.merge.complexity">Complexity</a>
</h6>
<p>
Linear. There are no comparisons if both <code class="computeroutput"><span class="identifier">rng1</span></code>
@ -242,7 +241,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>