summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------libs/algorithm0
m---------libs/concept_check0
m---------libs/format0
m---------libs/graph0
m---------libs/lambda0
m---------libs/numeric/interval0
m---------libs/numeric/ublas0
m---------libs/pool0
m---------libs/python0
m---------libs/random0
m---------libs/regex0
m---------libs/spirit0
m---------libs/test0
m---------libs/variant0
-rw-r--r--more/lib_guide.htm21
15 files changed, 14 insertions, 7 deletions
diff --git a/libs/algorithm b/libs/algorithm
-Subproject 77303abc557517a68da95b0982c21f0a77782f7
+Subproject 752c65be3520358bdbb6e5aee0d473086678586
diff --git a/libs/concept_check b/libs/concept_check
-Subproject 1b8f363e9004a6cd111e04a48eaefcf06da0321
+Subproject 9678d4a3f2c2a7b8ae95c268799206fec306ac3
diff --git a/libs/format b/libs/format
-Subproject d09013ce9c1de1e291e6e5549e375773556305e
+Subproject 806a448be7119765258ebc7bfb453abd73fb568
diff --git a/libs/graph b/libs/graph
-Subproject cf24fa4ca0bd042fa007d9b173d3746b82feb3d
+Subproject e3dd9042b175a15bdb325cc54486a1b08db7feb
diff --git a/libs/lambda b/libs/lambda
-Subproject b99048eab3122c8f79fb904e70cff8e44d31387
+Subproject a80b8a59a0f2dbaf6071057f8419b9f6bd83dd9
diff --git a/libs/numeric/interval b/libs/numeric/interval
-Subproject 32f6f4501863d9e69d10062929633c5acb668f5
+Subproject 175901733e98cd16bf475d341c295a8843192f2
diff --git a/libs/numeric/ublas b/libs/numeric/ublas
-Subproject f439cd2ca599151be5fc1c0a85fd3f6c2c2f4c6
+Subproject 6085f9282b060659e0af93666e0edcddf24e165
diff --git a/libs/pool b/libs/pool
-Subproject 4751c81a59270afb27f593109c156d064f22cb9
+Subproject c6efcd2b9042e17491d5d95545b3c0cb5d1c936
diff --git a/libs/python b/libs/python
-Subproject c6587596b1ac3573e01e176809efe89a20bae59
+Subproject 9d7097177de2c2d9759293f7f75b3582bda3fa2
diff --git a/libs/random b/libs/random
-Subproject 3ab77175bc3f92b2d3fd597590483147e788962
+Subproject 2f7b6e8f3d67d75333c74c44c41478840c98d55
diff --git a/libs/regex b/libs/regex
-Subproject d310bc983507397586306e44253d9fd81c38bb5
+Subproject 8d994b14b28fc7ee2e9197456ca5315ef421838
diff --git a/libs/spirit b/libs/spirit
-Subproject aafd151e5039e5c9d2e3f95072fa0b44099f9c7
+Subproject 175054f518330f9195d0ebe0620ddd495720dbe
diff --git a/libs/test b/libs/test
-Subproject e63b92bf0f5ccf7e65a3ab84f9a47abebde7fb5
+Subproject ecda2f0b9d2dca53fb61be084b2db73a9838ffe
diff --git a/libs/variant b/libs/variant
-Subproject 5bb8bbcd3229d25613974b7bf19722b700e1617
+Subproject ab5613293fcbf6ae3800f254d3f2d170ffd2b7f
diff --git a/more/lib_guide.htm b/more/lib_guide.htm
index 00c611305d..979084cab0 100644
--- a/more/lib_guide.htm
+++ b/more/lib_guide.htm
@@ -305,12 +305,19 @@
If you want to call <code>std::min()</code> or <code>std::max()</code>:<br>&nbsp;
<ul>
<li>
- Use <code>(std::min)(a,b)</code> if you do not require argument-dependent
- look-up.</li>&nbsp;
+ If you do not require argument-dependent look-up, use <code>(std::min)(a,b)</code>.
+ </li>&nbsp;
<li>
- Use <code>boost::std_min(a,b)</code> if you do require argument-dependent look-up.
- <code>boost::std_min()</code> delegates to <code>std::min()</code>.</li>&nbsp;
- </ul>
+ If you do require argument-dependent look-up, you should:<br>&nbsp;
+ <ul>
+ <li><code>#include &lt;boost/minmax.hpp&gt;</code></li>&nbsp;
+ <li>Use <code>BOOST_USING_STD_MIN();</code> to bring <code>std::min()</code> into
+ the current scope.</li>&nbsp;
+ <li>Use <code>min BOOST_PREVENT_MACRO_SUBSTITUTION (a,b);</code> to make an
+ argument-dependent call to <code>min(a,b)</code>.</li>&nbsp;
+ </ul>
+ </li>
+ </ul>&nbsp;
</li>
<li>
If you want to call <code>std::numeric_limits&lt;int&gt;::max()</code>, use
@@ -324,7 +331,7 @@
If you want to declare or define a function or a member function named <code>min</code>
or <code>max</code>, then you must use the <code>BOOST_PREVENT_MACRO_SUBSTITUTION</code>
macro. Instead of writing <code>int min() { return 0; }</code> you should write
- <code>int min BOOST_PREVENT_MACRO_SUBSTITUTION () { return 0; }</code>This is true
+ <code>int min BOOST_PREVENT_MACRO_SUBSTITUTION () { return 0; }</code> This is true
regardless if the function is a free (namespace scope) function, a member function or a
static member function, and it applies for the function declaration as well as the
function definition.<br>&nbsp;
@@ -369,7 +376,7 @@
<td>If any build files.</td>
</tr>
<tr>
- <td>doc</td>
+ <td><code>doc</code></td>
<td>Documentation (HTML) files.</td>
<td>If several doc files.</td>
</tr>