Merge [44151], [48025] to release. Closes #3064.

[SVN r53172]
This commit is contained in:
Daniel Frey
2009-05-22 09:00:11 +00:00
parent e57213b298
commit 211eb04f33
3 changed files with 300 additions and 215 deletions
+23 -15
View File
@@ -1420,9 +1420,9 @@ T operator+( T lhs, const T& rhs )
<tr>
<td><code><a name=
"euclidian_ring_operators1">euclidian_ring_operators&lt;T&gt;</a></code><br>
"euclidean_ring_operators1">euclidean_ring_operators&lt;T&gt;</a></code><br>
<code>euclidian_ring_operators1&lt;T&gt;</code></td>
<code>euclidean_ring_operators1&lt;T&gt;</code></td>
<td>
<ul>
@@ -1439,9 +1439,9 @@ T operator+( T lhs, const T&amp; rhs )
<tr>
<td><code><a name=
"euclidian_ring_operators2">euclidian_ring_operators&lt;T,
"euclidean_ring_operators2">euclidean_ring_operators&lt;T,
U&gt;</a></code><br>
<code>euclidian_ring_operators2&lt;T, U&gt;</code></td>
<code>euclidean_ring_operators2&lt;T, U&gt;</code></td>
<td>
<ul>
@@ -1464,14 +1464,14 @@ T operator+( T lhs, const T&amp; rhs )
<tr>
<td><code><a name=
"ordered_euclidian_ring_operators1">ordered_euclidian_ring_operators&lt;T&gt;</a></code><br>
"ordered_euclidean_ring_operators1">ordered_euclidean_ring_operators&lt;T&gt;</a></code><br>
<code>ordered_euclidian_ring_operators1&lt;T&gt;</code></td>
<code>ordered_euclidean_ring_operators1&lt;T&gt;</code></td>
<td>
<ul>
<li><code><a href=
"#euclidian_ring_operators1">euclidian_ring_operators&lt;T&gt;</a></code></li>
"#euclidean_ring_operators1">euclidean_ring_operators&lt;T&gt;</a></code></li>
<li><code><a href=
"#totally_ordered1">totally_ordered&lt;T&gt;</a></code></li>
@@ -1481,14 +1481,14 @@ T operator+( T lhs, const T&amp; rhs )
<tr>
<td><code><a name=
"ordered_euclidian_ring_operators2">ordered_euclidian_ring_operators&lt;T,
"ordered_euclidean_ring_operators2">ordered_euclidean_ring_operators&lt;T,
U&gt;</a></code><br>
<code>ordered_euclidian_ring_operators2&lt;T, U&gt;</code></td>
<code>ordered_euclidean_ring_operators2&lt;T, U&gt;</code></td>
<td>
<ul>
<li><code><a href=
"#euclidian_ring_operators2">euclidian_ring_operators&lt;T,
"#euclidean_ring_operators2">euclidean_ring_operators&lt;T,
U&gt;</a></code></li>
<li><code><a href="#totally_ordered2">totally_ordered&lt;T,
@@ -1498,6 +1498,15 @@ T operator+( T lhs, const T&amp; rhs )
</tr>
</table>
<h4>Spelling: euclidean vs. euclidian</h4>
<p>Older versions of the Boost.Operators library used
&quot;<code>euclidian</code>&quot;, but it was pointed out that
&quot;<code>euclidean</code>&quot; is the more common spelling.
To be compatible with older version, the library now supports
both spellings.
</p>
<h3><a name="ex_oprs">Example</a> Templates</h3>
<p>The arithmetic operator class templates <code><a href=
@@ -1576,9 +1585,8 @@ T operator+( T lhs, const T&amp; rhs )
<p>The <cite><a href="operators_test.cpp">operators_test.cpp</a></cite>
program demonstrates the use of the arithmetic operator templates, and
can also be used to verify correct operation. Check the <a href=
"../../status/compiler_status.html">compiler status report</a> for the
test results with selected platforms.</p>
can also be used to verify correct operation. Check the compiler status
report for the test results with selected platforms.</p>
<h2><a name="deref">Dereference</a> Operators and Iterator Helpers</h2>
@@ -2119,10 +2127,10 @@ public:
backward-compatible.</p>
<hr>
<p>Revised: 29 Oct 2004</p>
<p>Revised: 7 Aug 2008</p>
<p>Copyright &copy; Beman Dawes, David Abrahams, 1999-2001.</p>
<p>Copyright &copy; Daniel Frey, 2002-2004.</p>
<p>Copyright &copy; Daniel Frey, 2002-2008.</p>
<p>Use, modification, and distribution is subject to the Boost Software
License, Version 1.0. (See accompanying file
<a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy at