Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r71252 - trunk/boost/phoenix/core/detail
From: thom.heller_at_[hidden]
Date: 2011-04-14 12:32:49


Author: theller
Date: 2011-04-14 12:32:48 EDT (Thu, 14 Apr 2011)
New Revision: 71252
URL: http://svn.boost.org/trac/boost/changeset/71252

Log:
[phoenix] fixing another ADL misbehaviour
Text files modified:
   trunk/boost/phoenix/core/detail/function_eval.hpp | 12 ++++++------
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/boost/phoenix/core/detail/function_eval.hpp
==============================================================================
--- trunk/boost/phoenix/core/detail/function_eval.hpp (original)
+++ trunk/boost/phoenix/core/detail/function_eval.hpp 2011-04-14 12:32:48 EDT (Thu, 14 Apr 2011)
@@ -59,20 +59,20 @@
             typename result<function_eval(F const&, Context const&)>::type
             operator()(F const & f, Context const & ctx) const
             {
- return eval(f, ctx)();
+ return boost::phoenix::eval(f, ctx)();
             }
 
             template <typename F, typename Context>
             typename result<function_eval(F &, Context const&)>::type
             operator()(F & f, Context const & ctx) const
             {
- return eval(f, ctx)();
+ return boost::phoenix::eval(f, ctx)();
             }
 
         #define PHOENIX_GET_ARG(z, n, data) \
             typedef \
                 typename boost::result_of< \
- evaluator( \
+ boost::phoenix::evaluator( \
                         BOOST_PP_CAT(A, n) \
                       , Context \
                     ) \
@@ -80,7 +80,7 @@
                 BOOST_PP_CAT(a, n);
 
         #define PHOENIX_EVAL_ARG(z, n, data) \
- help_rvalue_deduction(eval(BOOST_PP_CAT(a, n), ctx))
+ help_rvalue_deduction(boost::phoenix::eval(BOOST_PP_CAT(a, n), ctx))
         
         #define M0(z, n, data) \
             typename proto::detail::uncvref<BOOST_PP_CAT(a, n)>::type
@@ -157,7 +157,7 @@
>::type
             operator()(F const & f, BOOST_PHOENIX_A_ref_a, Context const & ctx) const
             {
- return eval(f, ctx)(BOOST_PP_ENUM(BOOST_PHOENIX_ITERATION, PHOENIX_EVAL_ARG, _));
+ return boost::phoenix::eval(f, ctx)(BOOST_PP_ENUM(BOOST_PHOENIX_ITERATION, PHOENIX_EVAL_ARG, _));
             }
 
             template <typename F, BOOST_PHOENIX_typename_A, typename Context>
@@ -170,7 +170,7 @@
>::type
             operator()(F & f, BOOST_PHOENIX_A_ref_a, Context const & ctx) const
             {
- return eval(f, ctx)(BOOST_PP_ENUM(BOOST_PHOENIX_ITERATION, PHOENIX_EVAL_ARG, _));
+ return boost::phoenix::eval(f, ctx)(BOOST_PP_ENUM(BOOST_PHOENIX_ITERATION, PHOENIX_EVAL_ARG, _));
             }
 #endif
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk