feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Do not expand BOOST_{CXX14_}CONSTEXPR while preprocessing.

Browse Source 
Signed-off-by: Kohei Takahashi <flast@flast.jp>
This commit is contained in:
Kohei Takahashi
2014-10-17 16:44:57 +09:00
parent ec9530eb15
commit bcc2530f19
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
View File

@ -23,7 +23,7 @@ namespace boost { namespace fusion
struct unrolled_iter_fold struct unrolled_iter_fold
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -64,7 +64,7 @@ namespace boost { namespace fusion
struct unrolled_iter_fold<Result,3> struct unrolled_iter_fold<Result,3>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -91,7 +91,7 @@ namespace boost { namespace fusion
struct unrolled_iter_fold<Result,2> struct unrolled_iter_fold<Result,2>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -106,7 +106,7 @@ namespace boost { namespace fusion
struct unrolled_iter_fold<Result,1> struct unrolled_iter_fold<Result,1>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -118,7 +118,7 @@ namespace boost { namespace fusion
struct unrolled_iter_fold<Result,0> struct unrolled_iter_fold<Result,0>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const&, F) call(State const& state,It0 const&, F)
{ {
@ -281,7 +281,7 @@ namespace boost { namespace fusion
, SeqSize , SeqSize
>::type >::type
type; type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static type static type
call(StateRef state, Seq& seq, F f) call(StateRef state, Seq& seq, F f)
{ {
@ -301,7 +301,7 @@ namespace boost { namespace fusion
struct iter_fold_impl<0,StateRef,Seq,F> struct iter_fold_impl<0,StateRef,Seq,F>
{ {
typedef StateRef type; typedef StateRef type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static StateRef static StateRef
call(StateRef state, Seq&, F) call(StateRef state, Seq&, F)
{ {
@ -333,7 +333,7 @@ namespace boost { namespace fusion
{}; {};
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::iter_fold< inline typename result_of::iter_fold<
Seq Seq
, State const , State const
@ -347,7 +347,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::iter_fold< inline typename result_of::iter_fold<
Seq const Seq const
, State const , State const
@ -361,7 +361,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::iter_fold< inline typename result_of::iter_fold<
Seq Seq
, State const , State const
@ -375,7 +375,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::iter_fold< inline typename result_of::iter_fold<
Seq const Seq const
, State const , State const

22
include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
View File

@ -23,7 +23,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_fold struct unrolled_reverse_fold
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -64,7 +64,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_fold<Result,3> struct unrolled_reverse_fold<Result,3>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -91,7 +91,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_fold<Result,2> struct unrolled_reverse_fold<Result,2>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -106,7 +106,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_fold<Result,1> struct unrolled_reverse_fold<Result,1>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -118,7 +118,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_fold<Result,0> struct unrolled_reverse_fold<Result,0>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const&, F) call(State const& state,It0 const&, F)
{ {
@ -281,7 +281,7 @@ namespace boost { namespace fusion
, SeqSize , SeqSize
>::type >::type
type; type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static type static type
call(StateRef state, Seq& seq, F f) call(StateRef state, Seq& seq, F f)
{ {
@ -301,7 +301,7 @@ namespace boost { namespace fusion
struct reverse_fold_impl<0,StateRef,Seq,F> struct reverse_fold_impl<0,StateRef,Seq,F>
{ {
typedef StateRef type; typedef StateRef type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static StateRef static StateRef
call(StateRef state, Seq&, F) call(StateRef state, Seq&, F)
{ {
@ -333,7 +333,7 @@ namespace boost { namespace fusion
{}; {};
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_fold< inline typename result_of::reverse_fold<
Seq Seq
, State const , State const
@ -347,7 +347,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_fold< inline typename result_of::reverse_fold<
Seq const Seq const
, State const , State const
@ -361,7 +361,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_fold< inline typename result_of::reverse_fold<
Seq Seq
, State const , State const
@ -375,7 +375,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_fold< inline typename result_of::reverse_fold<
Seq const Seq const
, State const , State const

22
include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
View File

@ -23,7 +23,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_iter_fold struct unrolled_reverse_iter_fold
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -64,7 +64,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_iter_fold<Result,3> struct unrolled_reverse_iter_fold<Result,3>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -91,7 +91,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_iter_fold<Result,2> struct unrolled_reverse_iter_fold<Result,2>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -106,7 +106,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_iter_fold<Result,1> struct unrolled_reverse_iter_fold<Result,1>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const& it0,F f) call(State const& state,It0 const& it0,F f)
{ {
@ -118,7 +118,7 @@ namespace boost { namespace fusion
struct unrolled_reverse_iter_fold<Result,0> struct unrolled_reverse_iter_fold<Result,0>
{ {
template<typename State, typename It0, typename F> template<typename State, typename It0, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static Result static Result
call(State const& state,It0 const&, F) call(State const& state,It0 const&, F)
{ {
@ -281,7 +281,7 @@ namespace boost { namespace fusion
, SeqSize , SeqSize
>::type >::type
type; type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static type static type
call(StateRef state, Seq& seq, F f) call(StateRef state, Seq& seq, F f)
{ {
@ -301,7 +301,7 @@ namespace boost { namespace fusion
struct reverse_iter_fold_impl<0,StateRef,Seq,F> struct reverse_iter_fold_impl<0,StateRef,Seq,F>
{ {
typedef StateRef type; typedef StateRef type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
static StateRef static StateRef
call(StateRef state, Seq&, F) call(StateRef state, Seq&, F)
{ {
@ -333,7 +333,7 @@ namespace boost { namespace fusion
{}; {};
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_iter_fold< inline typename result_of::reverse_iter_fold<
Seq Seq
, State const , State const
@ -347,7 +347,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_iter_fold< inline typename result_of::reverse_iter_fold<
Seq const Seq const
, State const , State const
@ -361,7 +361,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_iter_fold< inline typename result_of::reverse_iter_fold<
Seq Seq
, State const , State const
@ -375,7 +375,7 @@ namespace boost { namespace fusion
f); f);
} }
template<typename Seq, typename State, typename F> template<typename Seq, typename State, typename F>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline typename result_of::reverse_iter_fold< inline typename result_of::reverse_iter_fold<
Seq const Seq const
, State const , State const

2
preprocess/wave.cfg
View File

@ -10,6 +10,8 @@
-D_M_IX86 -D_M_IX86
-NBOOST_STATIC_ASSERT -NBOOST_STATIC_ASSERT
-NBOOST_FORCEINLINE -NBOOST_FORCEINLINE
-NBOOST_CONSTEXPR
-NBOOST_CXX14_CONSTEXPR
-NBOOST_MPL_ASSERT -NBOOST_MPL_ASSERT
-NBOOST_MPL_ASSERT_MSG -NBOOST_MPL_ASSERT_MSG
-NBOOST_MPL_ASSERT_RELATION -NBOOST_MPL_ASSERT_RELATION