[Boost-commit] svn:boost r72485 - trunk/boost/phoenix/scope

Subject: [Boost-commit] svn:boost r72485 - trunk/boost/phoenix/scope
From: thom.heller_at_[hidden]
Date: 2011-06-08 08:45:56

Author: theller
Date: 2011-06-08 08:45:54 EDT (Wed, 08 Jun 2011)
New Revision: 72485
URL: http://svn.boost.org/trac/boost/changeset/72485

Log:
[phoenix] fixing scope module for msvc 7.1
Text files modified: 
   trunk/boost/phoenix/scope/lambda.hpp |    17 ++++++++++++++---                       
   trunk/boost/phoenix/scope/let.hpp    |    17 ++++++++++++++---                       
   2 files changed, 28 insertions(+), 6 deletions(-)

Modified: trunk/boost/phoenix/scope/lambda.hpp
==============================================================================
--- trunk/boost/phoenix/scope/lambda.hpp	(original)
+++ trunk/boost/phoenix/scope/lambda.hpp	2011-06-08 08:45:54 EDT (Wed, 08 Jun 2011)
@@ -205,9 +205,20 @@
                   , meta_grammar
                 >
               , proto::fold<
-                    proto::_value(proto::_child_c<0>)
-                  , mpl::true_()
-                  , mpl::and_<proto::_state, evaluator(proto::_, _context, int())>()
+                    proto::call<proto::_value(proto::_child_c<0>)>
+                  , proto::make<mpl::true_()>
+                  , proto::make<
+                        mpl::and_<
+                            proto::_state
+                          , proto::call<
+                                evaluator(
+                                    proto::_
+                                  , _context
+                                  , proto::make<int()>
+                                )
+                            >
+                        >()
+                    >
                 >
             >
         >

Modified: trunk/boost/phoenix/scope/let.hpp
==============================================================================
--- trunk/boost/phoenix/scope/let.hpp	(original)
+++ trunk/boost/phoenix/scope/let.hpp	2011-06-08 08:45:54 EDT (Wed, 08 Jun 2011)
@@ -165,9 +165,20 @@
         : proto::make<
             mpl::and_<
                 proto::fold<
-                    proto::_value(proto::_child_c<0>)
-                  , mpl::true_()
-                  , mpl::and_<proto::_state, evaluator(proto::_, _context, int())>()
+                    proto::call<proto::_value(proto::_child_c<0>)>
+                  , proto::make<mpl::true_()>
+                  , proto::make<
+                        mpl::and_<
+                            proto::_state
+                          , proto::call<
+                                evaluator(
+                                    proto::_
+                                  , _context
+                                  , proto::make<int()>
+                                )
+                            >
+                        >()
+                    >
                 >
               , evaluator(
                     proto::_child_c<2>