From 5dd6792af5e4954cf1442337907932118873554c Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Thu, 14 Apr 2011 21:13:14 +0000 Subject: [PATCH] [phoenix] fixed some gcc 4.4 hickups [SVN r71261] --- include/boost/phoenix/core/detail/actor_result_of.hpp | 2 +- include/boost/phoenix/core/reference.hpp | 4 ++-- include/boost/phoenix/core/v2_eval.hpp | 4 ++-- include/boost/phoenix/core/value.hpp | 2 +- include/boost/phoenix/object/const_cast.hpp | 2 +- include/boost/phoenix/object/delete.hpp | 2 +- include/boost/phoenix/object/detail/construct_eval.hpp | 2 +- include/boost/phoenix/object/detail/new_eval.hpp | 2 +- include/boost/phoenix/object/dynamic_cast.hpp | 2 +- include/boost/phoenix/object/reinterpret_cast.hpp | 2 +- include/boost/phoenix/object/static_cast.hpp | 2 +- include/boost/phoenix/operator/member.hpp | 6 +++--- include/boost/phoenix/scope/detail/local_var_def.hpp | 2 +- include/boost/phoenix/scope/this.hpp | 4 ++-- include/boost/phoenix/statement/detail/switch.hpp | 8 ++++---- .../boost/phoenix/statement/detail/try_catch_eval.hpp | 8 ++++---- include/boost/phoenix/statement/do_while.hpp | 4 ++-- include/boost/phoenix/statement/for.hpp | 4 ++-- include/boost/phoenix/statement/if.hpp | 10 +++++----- include/boost/phoenix/statement/switch.hpp | 8 ++++---- include/boost/phoenix/statement/throw.hpp | 2 +- include/boost/phoenix/statement/while.hpp | 4 ++-- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/boost/phoenix/core/detail/actor_result_of.hpp b/include/boost/phoenix/core/detail/actor_result_of.hpp index 47c7a15..972709e 100644 --- a/include/boost/phoenix/core/detail/actor_result_of.hpp +++ b/include/boost/phoenix/core/detail/actor_result_of.hpp @@ -44,7 +44,7 @@ struct nullary_actor_result { typedef - typename evaluator::impl< + typename boost::phoenix::evaluator::impl< Expr const& , vector2< vector1 *> & diff --git a/include/boost/phoenix/core/reference.hpp b/include/boost/phoenix/core/reference.hpp index 545f21c..8e73ad8 100644 --- a/include/boost/phoenix/core/reference.hpp +++ b/include/boost/phoenix/core/reference.hpp @@ -116,7 +116,7 @@ namespace boost { namespace phoenix typename boost::result_of &, Context const &)>::type operator()(boost::reference_wrapper > & r, Context const & ctx) const { - return eval(r, ctx); + return boost::phoenix::eval(r, ctx); } }; @@ -140,7 +140,7 @@ namespace boost { namespace phoenix typename boost::result_of const&, Context const &)>::type operator()(boost::reference_wrapper const> const & r, Context & ctx) const { - return eval(unwrap_ref(r), ctx); + return boost::phoenix::eval(unwrap_ref(r), ctx); } }; }} diff --git a/include/boost/phoenix/core/v2_eval.hpp b/include/boost/phoenix/core/v2_eval.hpp index b10c2b4..3641b72 100644 --- a/include/boost/phoenix/core/v2_eval.hpp +++ b/include/boost/phoenix/core/v2_eval.hpp @@ -41,9 +41,9 @@ namespace boost { namespace phoenix template typename result::type - operator()(Eval const & eval, Env const & env) const + operator()(Eval const & e, Env const & env) const { - return eval.eval(env); + return e.eval(env); } }; }} diff --git a/include/boost/phoenix/core/value.hpp b/include/boost/phoenix/core/value.hpp index 992f15f..01b5dda 100644 --- a/include/boost/phoenix/core/value.hpp +++ b/include/boost/phoenix/core/value.hpp @@ -63,7 +63,7 @@ namespace boost { namespace phoenix typename result const &, Context &)>::type operator()(actor const & expr, Context & ctx) const { - return eval(expr, ctx); + return boost::phoenix::eval(expr, ctx); } }; diff --git a/include/boost/phoenix/object/const_cast.hpp b/include/boost/phoenix/object/const_cast.hpp index 09c05da..cfe1912 100644 --- a/include/boost/phoenix/object/const_cast.hpp +++ b/include/boost/phoenix/object/const_cast.hpp @@ -40,7 +40,7 @@ namespace boost { namespace phoenix return const_cast< typename detail::result_of::target::type - >(eval(u, ctx)); + >(boost::phoenix::eval(u, ctx)); } }; diff --git a/include/boost/phoenix/object/delete.hpp b/include/boost/phoenix/object/delete.hpp index ed8b6aa..c0facf8 100644 --- a/include/boost/phoenix/object/delete.hpp +++ b/include/boost/phoenix/object/delete.hpp @@ -28,7 +28,7 @@ namespace boost { namespace phoenix result_type operator()(P const& p, Context &ctx) const { - delete eval(p, ctx); + delete boost::phoenix::eval(p, ctx); } }; diff --git a/include/boost/phoenix/object/detail/construct_eval.hpp b/include/boost/phoenix/object/detail/construct_eval.hpp index 23fb4a6..f54b827 100644 --- a/include/boost/phoenix/object/detail/construct_eval.hpp +++ b/include/boost/phoenix/object/detail/construct_eval.hpp @@ -63,7 +63,7 @@ ) const { #define EVAL_a(_,n,__) \ - BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) eval(a ## n, ctx) + BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) boost::phoenix::eval(a ## n, ctx) return typename detail::result_of::target::type( diff --git a/include/boost/phoenix/object/detail/new_eval.hpp b/include/boost/phoenix/object/detail/new_eval.hpp index 3cdf22b..3b8ad62 100644 --- a/include/boost/phoenix/object/detail/new_eval.hpp +++ b/include/boost/phoenix/object/detail/new_eval.hpp @@ -69,7 +69,7 @@ ) const { #define EVAL_a(_,n,__) \ - BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) eval(a ## n, ctx) + BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) boost::phoenix::eval(a ## n, ctx) return new typename result< new_eval(BOOST_PHOENIX_A_const_ref, Context &) diff --git a/include/boost/phoenix/object/dynamic_cast.hpp b/include/boost/phoenix/object/dynamic_cast.hpp index 89bea4c..8ba2ca7 100644 --- a/include/boost/phoenix/object/dynamic_cast.hpp +++ b/include/boost/phoenix/object/dynamic_cast.hpp @@ -40,7 +40,7 @@ namespace boost { namespace phoenix return dynamic_cast< typename detail::result_of::target::type - >(eval(u, ctx)); + >(boost::phoenix::eval(u, ctx)); } }; diff --git a/include/boost/phoenix/object/reinterpret_cast.hpp b/include/boost/phoenix/object/reinterpret_cast.hpp index 0a53022..0d0c2c4 100644 --- a/include/boost/phoenix/object/reinterpret_cast.hpp +++ b/include/boost/phoenix/object/reinterpret_cast.hpp @@ -40,7 +40,7 @@ namespace boost { namespace phoenix return reinterpret_cast< typename detail::result_of::target::type - >(eval(u, ctx)); + >(boost::phoenix::eval(u, ctx)); } }; diff --git a/include/boost/phoenix/object/static_cast.hpp b/include/boost/phoenix/object/static_cast.hpp index 6773c5d..9619b13 100644 --- a/include/boost/phoenix/object/static_cast.hpp +++ b/include/boost/phoenix/object/static_cast.hpp @@ -39,7 +39,7 @@ namespace boost { namespace phoenix { return static_cast< typename detail::result_of::target::type - >(eval(u, ctx)); + >(boost::phoenix::eval(u, ctx)); } }; diff --git a/include/boost/phoenix/operator/member.hpp b/include/boost/phoenix/operator/member.hpp index 1a2635f..5ea6453 100644 --- a/include/boost/phoenix/operator/member.hpp +++ b/include/boost/phoenix/operator/member.hpp @@ -95,7 +95,7 @@ namespace boost { namespace phoenix #define BOOST_PHOENIX_MEMBER_EVAL(Z, N, D) \ BOOST_PP_COMMA_IF(BOOST_PP_NOT(BOOST_PP_EQUAL(N, 2))) \ - eval(BOOST_PP_CAT(a, N), ctx) \ + boost::phoenix::eval(BOOST_PP_CAT(a, N), ctx) \ /**/ #define BOOST_PHOENIX_ITERATION_PARAMS \ @@ -142,8 +142,8 @@ namespace boost { namespace phoenix { return ( - get_pointer(eval(a0, ctx)) - ->*eval(a1, ctx) + get_pointer(boost::phoenix::eval(a0, ctx)) + ->*boost::phoenix::eval(a1, ctx) )( BOOST_PP_REPEAT_FROM_TO( 2 diff --git a/include/boost/phoenix/scope/detail/local_var_def.hpp b/include/boost/phoenix/scope/detail/local_var_def.hpp index b0b1e3e..5d8ce81 100644 --- a/include/boost/phoenix/scope/detail/local_var_def.hpp +++ b/include/boost/phoenix/scope/detail/local_var_def.hpp @@ -43,7 +43,7 @@ #define M3(Z, N, D) \ BOOST_PP_CAT(pair, N)( \ - eval(fusion::at_key(locals), ctx) \ + boost::phoenix::eval(fusion::at_key(locals), ctx) \ ) \ /**/ diff --git a/include/boost/phoenix/scope/this.hpp b/include/boost/phoenix/scope/this.hpp index b1d98ba..aedf5b2 100644 --- a/include/boost/phoenix/scope/this.hpp +++ b/include/boost/phoenix/scope/this.hpp @@ -129,7 +129,7 @@ namespace boost { namespace phoenix { //std::cout << typeid(checker).name() << "\n"; //std::cout << typeid(checker).name() << "\n"; - return eval(_this, ctx)(eval(t0, ctx)); + return boost::phoenix::eval(_this, ctx)(boost::phoenix::eval(t0, ctx)); } template @@ -141,7 +141,7 @@ namespace boost { namespace phoenix { //std::cout << typeid(checker).name() << "\n"; - return eval(_this, ctx)(eval(t0, ctx), eval(t1, ctx)); + return boost::phoenix::eval(_this, ctx)(boost::phoenix::eval(t0, ctx), boost::phoenix::eval(t1, ctx)); } }; diff --git a/include/boost/phoenix/statement/detail/switch.hpp b/include/boost/phoenix/statement/detail/switch.hpp index 5522c97..d7a0060 100644 --- a/include/boost/phoenix/statement/detail/switch.hpp +++ b/include/boost/phoenix/statement/detail/switch.hpp @@ -56,7 +56,7 @@ #define BOOST_PHOENIX_SWITCH_EVAL_R(Z, N, DATA) \ case BOOST_PP_CAT(case_label, N)::value : \ - eval( \ + boost::phoenix::eval( \ proto::child_c<1>( \ fusion::deref( \ fusion::advance_c(fusion::begin(flat_view)) \ @@ -108,7 +108,7 @@ , BOOST_PHOENIX_ITERATION ) - switch(eval(cond, ctx)) + switch(boost::phoenix::eval(cond, ctx)) { BOOST_PP_REPEAT(BOOST_PHOENIX_ITERATION, BOOST_PHOENIX_SWITCH_EVAL_R, _) } @@ -140,14 +140,14 @@ , BOOST_PHOENIX_ITERATION ) - switch(eval(cond, ctx)) + switch(boost::phoenix::eval(cond, ctx)) { BOOST_PP_REPEAT( BOOST_PP_DEC(BOOST_PHOENIX_ITERATION) , BOOST_PHOENIX_SWITCH_EVAL_R, _ ) default: - eval( + boost::phoenix::eval( proto::child_c<0>( fusion::deref( fusion::advance_c< diff --git a/include/boost/phoenix/statement/detail/try_catch_eval.hpp b/include/boost/phoenix/statement/detail/try_catch_eval.hpp index e60c61f..0bd015f 100644 --- a/include/boost/phoenix/statement/detail/try_catch_eval.hpp +++ b/include/boost/phoenix/statement/detail/try_catch_eval.hpp @@ -43,7 +43,7 @@ >::type::type & \ ) \ { \ - eval(proto::child_c<1>(BOOST_PP_CAT(a, N)), ctx); \ + boost::phoenix::eval(proto::child_c<1>(BOOST_PP_CAT(a, N)), ctx); \ } \ /**/ @@ -75,7 +75,7 @@ { try { - eval(proto::child_c<0>(try_), ctx); + boost::phoenix::eval(proto::child_c<0>(try_), ctx); } BOOST_PP_REPEAT(BOOST_PHOENIX_ITERATION, BOOST_PHOENIX_TRY_CATCH_EVAL_R, _) } @@ -92,7 +92,7 @@ { try { - eval(proto::child_c<0>(try_), ctx); + boost::phoenix::eval(proto::child_c<0>(try_), ctx); } BOOST_PP_REPEAT( BOOST_PP_DEC(BOOST_PHOENIX_ITERATION) @@ -100,7 +100,7 @@ ) catch(...) { - eval( + boost::phoenix::eval( proto::child_c<0>( BOOST_PP_CAT(a, BOOST_PP_DEC(BOOST_PHOENIX_ITERATION)) ) diff --git a/include/boost/phoenix/statement/do_while.hpp b/include/boost/phoenix/statement/do_while.hpp index 4228c7e..abc10ba 100644 --- a/include/boost/phoenix/statement/do_while.hpp +++ b/include/boost/phoenix/statement/do_while.hpp @@ -30,8 +30,8 @@ namespace boost { namespace phoenix operator()(Cond const& cond, Do const& do_, Context & ctx) const { do - eval(do_, ctx); - while (eval(cond, ctx)); + boost::phoenix::eval(do_, ctx); + while (boost::phoenix::eval(cond, ctx)); } }; diff --git a/include/boost/phoenix/statement/for.hpp b/include/boost/phoenix/statement/for.hpp index 9219458..9cb464b 100644 --- a/include/boost/phoenix/statement/for.hpp +++ b/include/boost/phoenix/statement/for.hpp @@ -43,8 +43,8 @@ namespace boost { namespace phoenix , Context & ctx ) const { - for(eval(init, ctx); eval(cond, ctx); eval(step, ctx)) - eval(do_, ctx); + for(boost::phoenix::eval(init, ctx); boost::phoenix::eval(cond, ctx); boost::phoenix::eval(step, ctx)) + boost::phoenix::eval(do_, ctx); } }; diff --git a/include/boost/phoenix/statement/if.hpp b/include/boost/phoenix/statement/if.hpp index 907440f..2819ef3 100644 --- a/include/boost/phoenix/statement/if.hpp +++ b/include/boost/phoenix/statement/if.hpp @@ -58,8 +58,8 @@ namespace boost { namespace phoenix result_type operator()(Cond const & cond, Then const & then, Context & ctx) const { - if(eval(cond, ctx)) - eval(then, ctx); + if(boost::phoenix::eval(cond, ctx)) + boost::phoenix::eval(then, ctx); } template @@ -71,10 +71,10 @@ namespace boost { namespace phoenix , Context const & ctx ) const { - if(eval(cond, ctx)) - eval(then, ctx); + if(boost::phoenix::eval(cond, ctx)) + boost::phoenix::eval(then, ctx); else - eval(else_, ctx); + boost::phoenix::eval(else_, ctx); } }; diff --git a/include/boost/phoenix/statement/switch.hpp b/include/boost/phoenix/statement/switch.hpp index dca2c11..63b2ae3 100644 --- a/include/boost/phoenix/statement/switch.hpp +++ b/include/boost/phoenix/statement/switch.hpp @@ -159,10 +159,10 @@ namespace boost { namespace phoenix { >::type case_label; - switch(eval(cond, ctx)) + switch(boost::phoenix::eval(cond, ctx)) { case case_label::value: - eval(proto::child_c<1>(cases), ctx); + boost::phoenix::eval(proto::child_c<1>(cases), ctx); } } @@ -176,10 +176,10 @@ namespace boost { namespace phoenix { , mpl::true_ ) const { - switch(eval(cond, ctx)) + switch(boost::phoenix::eval(cond, ctx)) { default: - eval(proto::child_c<0>(cases), ctx); + boost::phoenix::eval(proto::child_c<0>(cases), ctx); } } diff --git a/include/boost/phoenix/statement/throw.hpp b/include/boost/phoenix/statement/throw.hpp index 26781ed..2ed6ad0 100644 --- a/include/boost/phoenix/statement/throw.hpp +++ b/include/boost/phoenix/statement/throw.hpp @@ -52,7 +52,7 @@ namespace boost { namespace phoenix result_type operator()(ThrowExpr const& throw_expr, Context & ctx) const { - throw eval(throw_expr, ctx); + throw boost::phoenix::eval(throw_expr, ctx); } }; diff --git a/include/boost/phoenix/statement/while.hpp b/include/boost/phoenix/statement/while.hpp index 4b5b600..a996f25 100644 --- a/include/boost/phoenix/statement/while.hpp +++ b/include/boost/phoenix/statement/while.hpp @@ -29,9 +29,9 @@ namespace boost { namespace phoenix result_type operator()(Cond const& cond, Do const& do_, Context & ctx) const { - while(eval(cond, ctx)) + while(boost::phoenix::eval(cond, ctx)) { - eval(do_, ctx); + boost::phoenix::eval(do_, ctx); } } };