feedc0de/boost_preprocessor
1
0
Fork 0
forked from boostorg/preprocessor
Code Pull Requests Activity

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

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ref/enum_params_with_defaults.html
View File

@ -64,10 +64,10 @@
#include &lt;<a href="../headers/repetition/epwd.html">boost/preprocessor/repetition/enum_params_with_defaults.hpp</a>&gt; #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) <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) <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> </pre></div>
<hr size="1"> <hr size="1">
<div style="margin-left: 0px;"> <div style="margin-left: 0px;">

2
doc/ref/iif.html
View File

@ -44,7 +44,7 @@
<h4>Sample Code</h4> <h4>Sample Code</h4>
<div><pre> <div><pre>
#include &lt;<a href="../headers/control/iif.html">boost/preprocessor/control/iif.hpp</a>&gt; #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) #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)

2
doc/ref/limit_iteration_dim.html
View File

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

2
doc/ref/seq_tail.html
View File

@ -5,7 +5,7 @@
</head> </head>
<body> <body>
<div style="margin-left: 0px;"> <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> </div>
<h4> <h4>
Usage Usage

9
include/boost/preprocessor/seq/cat.hpp
View File

@ -26,7 +26,7 @@
BOOST_PP_IF( \ BOOST_PP_IF( \
BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(seq)), \ BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(seq)), \
BOOST_PP_SEQ_CAT_I, \ BOOST_PP_SEQ_CAT_I, \
BOOST_PP_SEQ_HEAD(seq) BOOST_PP_TUPLE_EAT_1 \ BOOST_PP_SEQ_HEAD \
)(seq) \ )(seq) \
/**/ /**/
# define BOOST_PP_SEQ_CAT_I(seq) BOOST_PP_SEQ_FOLD_LEFT(BOOST_PP_SEQ_CAT_O, BOOST_PP_SEQ_HEAD(seq), BOOST_PP_SEQ_TAIL(seq)) # define BOOST_PP_SEQ_CAT_I(seq) BOOST_PP_SEQ_FOLD_LEFT(BOOST_PP_SEQ_CAT_O, BOOST_PP_SEQ_HEAD(seq), BOOST_PP_SEQ_TAIL(seq))
@ -39,10 +39,11 @@
# define BOOST_PP_SEQ_CAT_S(s, seq) \ # define BOOST_PP_SEQ_CAT_S(s, seq) \
BOOST_PP_IF( \ BOOST_PP_IF( \
BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(seq)), \ BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(seq)), \
BOOST_PP_SEQ_CAT_S_I, \ BOOST_PP_SEQ_CAT_S_I_A, \
BOOST_PP_SEQ_HEAD(seq) BOOST_PP_TUPLE_EAT_2 \ BOOST_PP_SEQ_CAT_S_I_B \
)(s, seq) \ )(s, seq) \
/**/ /**/
# define BOOST_PP_SEQ_CAT_S_I(s, seq) BOOST_PP_SEQ_FOLD_LEFT_ ## s(BOOST_PP_SEQ_CAT_O, BOOST_PP_SEQ_HEAD(seq), BOOST_PP_SEQ_TAIL(seq)) # define BOOST_PP_SEQ_CAT_S_I_A(s, seq) BOOST_PP_SEQ_FOLD_LEFT_ ## s(BOOST_PP_SEQ_CAT_O, BOOST_PP_SEQ_HEAD(seq), BOOST_PP_SEQ_TAIL(seq))
# define BOOST_PP_SEQ_CAT_S_I_B(s, seq) BOOST_PP_SEQ_HEAD(seq)
# #
# endif # endif

1
include/boost/preprocessor/seq/size.hpp
View File

@ -14,7 +14,6 @@
# #
# include <boost/preprocessor/cat.hpp> # include <boost/preprocessor/cat.hpp>
# include <boost/preprocessor/config/config.hpp> # include <boost/preprocessor/config/config.hpp>
# include <boost/preprocessor/tuple/eat.hpp>
# #
# if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC() # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC()
# define BOOST_PP_SEQ_SIZE(seq) BOOST_PP_SEQ_SIZE_I((seq)) # define BOOST_PP_SEQ_SIZE(seq) BOOST_PP_SEQ_SIZE_I((seq))