Subject: [Boost-commit] svn:boost r71261 - in trunk/boost/phoenix: core core/detail object object/detail operator scope scope/detail statement statement/detail
From: thom.heller_at_[hidden]
Date: 2011-04-14 17:13:16
Author: theller
Date: 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
New Revision: 71261
URL: http://svn.boost.org/trac/boost/changeset/71261
Log:
[phoenix] fixed some gcc 4.4 hickups
Text files modified:
trunk/boost/phoenix/core/detail/actor_result_of.hpp | 2 +-
trunk/boost/phoenix/core/reference.hpp | 4 ++--
trunk/boost/phoenix/core/v2_eval.hpp | 4 ++--
trunk/boost/phoenix/core/value.hpp | 2 +-
trunk/boost/phoenix/object/const_cast.hpp | 2 +-
trunk/boost/phoenix/object/delete.hpp | 2 +-
trunk/boost/phoenix/object/detail/construct_eval.hpp | 2 +-
trunk/boost/phoenix/object/detail/new_eval.hpp | 2 +-
trunk/boost/phoenix/object/dynamic_cast.hpp | 2 +-
trunk/boost/phoenix/object/reinterpret_cast.hpp | 2 +-
trunk/boost/phoenix/object/static_cast.hpp | 2 +-
trunk/boost/phoenix/operator/member.hpp | 6 +++---
trunk/boost/phoenix/scope/detail/local_var_def.hpp | 2 +-
trunk/boost/phoenix/scope/this.hpp | 4 ++--
trunk/boost/phoenix/statement/detail/switch.hpp | 8 ++++----
trunk/boost/phoenix/statement/detail/try_catch_eval.hpp | 8 ++++----
trunk/boost/phoenix/statement/do_while.hpp | 4 ++--
trunk/boost/phoenix/statement/for.hpp | 4 ++--
trunk/boost/phoenix/statement/if.hpp | 10 +++++-----
trunk/boost/phoenix/statement/switch.hpp | 8 ++++----
trunk/boost/phoenix/statement/throw.hpp | 2 +-
trunk/boost/phoenix/statement/while.hpp | 4 ++--
22 files changed, 43 insertions(+), 43 deletions(-)
Modified: trunk/boost/phoenix/core/detail/actor_result_of.hpp
==============================================================================
--- trunk/boost/phoenix/core/detail/actor_result_of.hpp (original)
+++ trunk/boost/phoenix/core/detail/actor_result_of.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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> *> &
Modified: trunk/boost/phoenix/core/reference.hpp
==============================================================================
--- trunk/boost/phoenix/core/reference.hpp (original)
+++ trunk/boost/phoenix/core/reference.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -116,7 +116,7 @@
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 @@
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);
}
};
}}
Modified: trunk/boost/phoenix/core/v2_eval.hpp
==============================================================================
--- trunk/boost/phoenix/core/v2_eval.hpp (original)
+++ trunk/boost/phoenix/core/v2_eval.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -41,9 +41,9 @@
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);
}
};
}}
Modified: trunk/boost/phoenix/core/value.hpp
==============================================================================
--- trunk/boost/phoenix/core/value.hpp (original)
+++ trunk/boost/phoenix/core/value.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -63,7 +63,7 @@
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);
}
};
Modified: trunk/boost/phoenix/object/const_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/const_cast.hpp (original)
+++ trunk/boost/phoenix/object/const_cast.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -40,7 +40,7 @@
return
const_cast<
typename detail::result_of::target<Target>::type
- >(eval(u, ctx));
+ >(boost::phoenix::eval(u, ctx));
}
};
Modified: trunk/boost/phoenix/object/delete.hpp
==============================================================================
--- trunk/boost/phoenix/object/delete.hpp (original)
+++ trunk/boost/phoenix/object/delete.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -28,7 +28,7 @@
result_type
operator()(P const& p, Context &ctx) const
{
- delete eval(p, ctx);
+ delete boost::phoenix::eval(p, ctx);
}
};
Modified: trunk/boost/phoenix/object/detail/construct_eval.hpp
==============================================================================
--- trunk/boost/phoenix/object/detail/construct_eval.hpp (original)
+++ trunk/boost/phoenix/object/detail/construct_eval.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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(
Modified: trunk/boost/phoenix/object/detail/new_eval.hpp
==============================================================================
--- trunk/boost/phoenix/object/detail/new_eval.hpp (original)
+++ trunk/boost/phoenix/object/detail/new_eval.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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 &)
Modified: trunk/boost/phoenix/object/dynamic_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/dynamic_cast.hpp (original)
+++ trunk/boost/phoenix/object/dynamic_cast.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -40,7 +40,7 @@
return
dynamic_cast<
typename detail::result_of::target<Target>::type
- >(eval(u, ctx));
+ >(boost::phoenix::eval(u, ctx));
}
};
Modified: trunk/boost/phoenix/object/reinterpret_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/reinterpret_cast.hpp (original)
+++ trunk/boost/phoenix/object/reinterpret_cast.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -40,7 +40,7 @@
return
reinterpret_cast<
typename detail::result_of::target<Target>::type
- >(eval(u, ctx));
+ >(boost::phoenix::eval(u, ctx));
}
};
Modified: trunk/boost/phoenix/object/static_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/static_cast.hpp (original)
+++ trunk/boost/phoenix/object/static_cast.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -39,7 +39,7 @@
{
return static_cast<
typename detail::result_of::target<Target>::type
- >(eval(u, ctx));
+ >(boost::phoenix::eval(u, ctx));
}
};
Modified: trunk/boost/phoenix/operator/member.hpp
==============================================================================
--- trunk/boost/phoenix/operator/member.hpp (original)
+++ trunk/boost/phoenix/operator/member.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -95,7 +95,7 @@
#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 @@
{
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
Modified: trunk/boost/phoenix/scope/detail/local_var_def.hpp
==============================================================================
--- trunk/boost/phoenix/scope/detail/local_var_def.hpp (original)
+++ trunk/boost/phoenix/scope/detail/local_var_def.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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) \
) \
/**/
Modified: trunk/boost/phoenix/scope/this.hpp
==============================================================================
--- trunk/boost/phoenix/scope/this.hpp (original)
+++ trunk/boost/phoenix/scope/this.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -129,7 +129,7 @@
//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 @@
//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));
}
};
Modified: trunk/boost/phoenix/statement/detail/switch.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/switch.hpp (original)
+++ trunk/boost/phoenix/statement/detail/switch.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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<
Modified: trunk/boost/phoenix/statement/detail/try_catch_eval.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/try_catch_eval.hpp (original)
+++ trunk/boost/phoenix/statement/detail/try_catch_eval.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -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))
)
Modified: trunk/boost/phoenix/statement/do_while.hpp
==============================================================================
--- trunk/boost/phoenix/statement/do_while.hpp (original)
+++ trunk/boost/phoenix/statement/do_while.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -30,8 +30,8 @@
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));
}
};
Modified: trunk/boost/phoenix/statement/for.hpp
==============================================================================
--- trunk/boost/phoenix/statement/for.hpp (original)
+++ trunk/boost/phoenix/statement/for.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -43,8 +43,8 @@
, 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);
}
};
Modified: trunk/boost/phoenix/statement/if.hpp
==============================================================================
--- trunk/boost/phoenix/statement/if.hpp (original)
+++ trunk/boost/phoenix/statement/if.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -58,8 +58,8 @@
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 @@
, 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);
}
};
Modified: trunk/boost/phoenix/statement/switch.hpp
==============================================================================
--- trunk/boost/phoenix/statement/switch.hpp (original)
+++ trunk/boost/phoenix/statement/switch.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -159,10 +159,10 @@
>::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 @@
, 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);
}
}
Modified: trunk/boost/phoenix/statement/throw.hpp
==============================================================================
--- trunk/boost/phoenix/statement/throw.hpp (original)
+++ trunk/boost/phoenix/statement/throw.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -52,7 +52,7 @@
result_type
operator()(ThrowExpr const& throw_expr, Context & ctx) const
{
- throw eval(throw_expr, ctx);
+ throw boost::phoenix::eval(throw_expr, ctx);
}
};
Modified: trunk/boost/phoenix/statement/while.hpp
==============================================================================
--- trunk/boost/phoenix/statement/while.hpp (original)
+++ trunk/boost/phoenix/statement/while.hpp 2011-04-14 17:13:14 EDT (Thu, 14 Apr 2011)
@@ -29,9 +29,9 @@
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);
}
}
};