[phoenix] fixing scope module for msvc 7.1

[SVN r72485]
myestro · Jun 8, 2011 · 1b4464b · 1b4464b
1 parent 2687bd7
commit 1b4464b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/include/boost/phoenix/scope/lambda.hpp b/include/boost/phoenix/scope/lambda.hpp
@@ -205,9 +205,20 @@ namespace boost { namespace phoenix
                   , 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()>
+                                )
+                            >
+                        >()
+                    >
                 >
             >
         >

diff --git a/include/boost/phoenix/scope/let.hpp b/include/boost/phoenix/scope/let.hpp
@@ -165,9 +165,20 @@ namespace boost { namespace phoenix
         : 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>