boost/phoenix
2
0
Fork 0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-15 01:12:09 +00:00
Code Issues Projects Releases Wiki Activity

[phoenix] fixed some gcc 4.4 hickups

Browse Source 
[SVN r71261]
This commit is contained in:
Thomas Heller
2011-04-14 21:13:14 +00:00
parent f661efe964
commit 5dd6792af5
22 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/phoenix/core/detail/actor_result_of.hpp
View File

@@ -44,7 +44,7 @@
struct nullary_actor_result
{
typedef
typename evaluator::impl<
typename boost::phoenix::evaluator::impl<
Expr const&
, vector2<
vector1<const ::boost::phoenix::actor<Expr> *> &

4
include/boost/phoenix/core/reference.hpp
View File

@@ -116,7 +116,7 @@ namespace boost { namespace phoenix
typename boost::result_of<evaluator(actor<Expr> &, Context const &)>::type
operator()(boost::reference_wrapper<actor<Expr> > & 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<evaluator(actor<Expr> const&, Context const &)>::type
operator()(boost::reference_wrapper<actor<Expr> const> const & r, Context & ctx) const
{
return eval(unwrap_ref(r), ctx);
return boost::phoenix::eval(unwrap_ref(r), ctx);
}
};
}}

4
include/boost/phoenix/core/v2_eval.hpp
View File

@@ -41,9 +41,9 @@ namespace boost { namespace phoenix
template <typename Eval, typename Env>
typename result<v2_eval(Eval const&, Env)>::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);
}
};
}}

2
include/boost/phoenix/core/value.hpp
View File

@@ -63,7 +63,7 @@ namespace boost { namespace phoenix
typename result<custom_terminal(actor<Expr> const &, Context &)>::type
operator()(actor<Expr> const & expr, Context & ctx) const
{
return eval(expr, ctx);
return boost::phoenix::eval(expr, ctx);
}
};

2
include/boost/phoenix/object/const_cast.hpp
View File

@@ -40,7 +40,7 @@ namespace boost { namespace phoenix
return
const_cast<
typename detail::result_of::target<Target>::type
>(eval(u, ctx));
>(boost::phoenix::eval(u, ctx));
}
};

2
include/boost/phoenix/object/delete.hpp
View File

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

2
include/boost/phoenix/object/detail/construct_eval.hpp
View File

@@ -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<A0>::type(

2
include/boost/phoenix/object/detail/new_eval.hpp
View File

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

2
include/boost/phoenix/object/dynamic_cast.hpp
View File

@@ -40,7 +40,7 @@ namespace boost { namespace phoenix
return
dynamic_cast<
typename detail::result_of::target<Target>::type
>(eval(u, ctx));
>(boost::phoenix::eval(u, ctx));
}
};

2
include/boost/phoenix/object/reinterpret_cast.hpp
View File

@@ -40,7 +40,7 @@ namespace boost { namespace phoenix
return
reinterpret_cast<
typename detail::result_of::target<Target>::type
>(eval(u, ctx));
>(boost::phoenix::eval(u, ctx));
}
};

2
include/boost/phoenix/object/static_cast.hpp
View File

@@ -39,7 +39,7 @@ namespace boost { namespace phoenix
{
return static_cast<
typename detail::result_of::target<Target>::type
>(eval(u, ctx));
>(boost::phoenix::eval(u, ctx));
}
};

6
include/boost/phoenix/operator/member.hpp
View File

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

2
include/boost/phoenix/scope/detail/local_var_def.hpp
View File

@@ -43,7 +43,7 @@
#define M3(Z, N, D) \
BOOST_PP_CAT(pair, N)( \
eval(fusion::at_key<BOOST_PP_CAT(Tag, N)>(locals), ctx) \
boost::phoenix::eval(fusion::at_key<BOOST_PP_CAT(Tag, N)>(locals), ctx) \
) \
/**/

4
include/boost/phoenix/scope/this.hpp
View File

@@ -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 <typename This, typename T0, typename T1, typename Context>
@@ -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));
}
};

8
include/boost/phoenix/statement/detail/switch.hpp
View File

@@ -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<N>(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<

8
include/boost/phoenix/statement/detail/try_catch_eval.hpp
View File

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

4
include/boost/phoenix/statement/do_while.hpp
View File

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

4
include/boost/phoenix/statement/for.hpp
View File

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

10
include/boost/phoenix/statement/if.hpp
View File

@@ -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<typename Cond, typename Then, typename Else, typename Context>
@@ -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);
}
};

8
include/boost/phoenix/statement/switch.hpp
View File

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

2
include/boost/phoenix/statement/throw.hpp
View File

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

4
include/boost/phoenix/statement/while.hpp
View File

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