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

@ -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)