Merge [43112], [62165], [65119], and [65120] from the trunk.

[SVN r71037]
This commit is contained in:
Steven Watanabe
2011-04-06 17:22:43 +00:00
parent d674ec9d6e
commit c81e77bb16
6 changed files with 10 additions and 10 deletions

View File

@ -64,10 +64,10 @@
#include &lt;<a href="../headers/repetition/epwd.html">boost/preprocessor/repetition/enum_params_with_defaults.hpp</a>&gt;
<a href="enum_params_with_defaults.html">BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS</a>(3, class T, U)
// expands to T0 = U0, T1 = U1, T2 = U2
// expands to class T0 = U0, class T1 = U1, class T2 = U2
<a href="enum_binary_params.html">BOOST_PP_ENUM_BINARY_PARAMS</a>(3, class T, = U)
// expands to T0 = U0, T1 = U1, T2 = U2
// expands to class T0 = U0, class T1 = U1, class T2 = U2
</pre></div>
<hr size="1">
<div style="margin-left: 0px;">

View File

@ -44,7 +44,7 @@
<h4>Sample Code</h4>
<div><pre>
#include &lt;<a href="../headers/control/iif.html">boost/preprocessor/control/iif.hpp</a>&gt;
#include &lt;<a href="../headers/logical/or.html">boost/preprocessor/logical/or.hpp</a>
#include &lt;<a href="../headers/logical/or.html">boost/preprocessor/logical/or.hpp</a>&gt;
#define OR_IF(p, q, t, f) <a href="iif.html">BOOST_PP_IIF</a>(<a href="or.html">BOOST_PP_OR</a>(p, q), t, f)

View File

@ -13,7 +13,7 @@
</div>
<h4>Remarks</h4>
<div>
This macro currently expands to <i>5</i>.
This macro currently expands to <i>3</i>.
</div>
<h4>Requirements</h4>
<div>

View File

@ -5,7 +5,7 @@
</head>
<body>
<div style="margin-left: 0px;">
The <b>BOOST_PP_SEQ_HEAD</b> macro expands to all but the first element of a <i>seq</i>.
The <b>BOOST_PP_SEQ_TAIL</b> macro expands to all but the first element of a <i>seq</i>.
</div>
<h4>
Usage