boostorg/preprocessor
1
0
Fork 1
mirror of https://github.com/boostorg/preprocessor.git synced 2025-07-23 17:17:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for BOOST_PP_LIST_FILTER, which should not use BOOST_PP_IF details

Browse Source 
[SVN r14227]
This commit is contained in:
Vesa Karvonen
2002-06-22 21:53:34 +00:00
parent d574738487
commit a7853cdd68
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/preprocessor/expr_if.hpp
View File

@ -13,9 +13,6 @@
* See http://www.boost.org for most recent version.
*/
// pm: not necessary if using manual delay
// #include <boost/preprocessor/detail/cat.hpp>
#include <boost/preprocessor/logical/bool.hpp>
/** <p>Expands to <code>EXPR</code> if <code>COND != 0</code> and to nothing if <code>COND == 0</code>.</p>

13
include/boost/preprocessor/if.hpp
View File

@ -13,9 +13,6 @@
* See http://www.boost.org for most recent version.
*/
// pm: not necessary if using manual delay
// #include <boost/preprocessor/detail/cat.hpp>
#include <boost/preprocessor/logical/bool.hpp>
/** <p>Expands to <code>THEN</code> if <code>COND != 0</code> and <code>ELSE</code> if
@ -35,11 +32,11 @@
<li><a href="../../test/preprocessor_test.cpp">preprocessor_test.cpp</a></li>
</ul>
*/
#define BOOST_PP_IF(COND,THEN,ELSE) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(COND),THEN,ELSE) /* original: BOOST_PP_DETAIL_CAT2(BOOST_PP_IF,BOOST_PP_BOOL(COND))(ELSE,THEN) */
#define BOOST_PP_IF(COND,THEN,ELSE) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(COND),ELSE,THEN)
#define BOOST_PP_IF_BOOL(COND,THEN,ELSE) BOOST_PP_IF_BOOL_DELAY(COND,THEN,ELSE)
#define BOOST_PP_IF_BOOL_DELAY(COND,THEN,ELSE) BOOST_PP_IF##COND(THEN,ELSE)
#define BOOST_PP_IF_BOOL(C,E,T) BOOST_PP_IF_BOOL_DELAY(C,E,T)
#define BOOST_PP_IF_BOOL_DELAY(C,E,T) BOOST_PP_IF##C(E,T)
#define BOOST_PP_IF0(T,E) E // BOOST_PP_IF0(E,T) E
#define BOOST_PP_IF1(T,E) T // BOOST_PP_IF1(E,T) T
#define BOOST_PP_IF0(E,T) E
#define BOOST_PP_IF1(E,T) T
#endif