[Boost-commit] svn:boost r48917 - in branches/proto/v4/boost/phoenix: bind core scope

Subject: [Boost-commit] svn:boost r48917 - in branches/proto/v4/boost/phoenix: bind core scope
From: eric_at_[hidden]
Date: 2008-09-22 00:47:02

Author: eric_niebler
Date: 2008-09-22 00:47:01 EDT (Mon, 22 Sep 2008)
New Revision: 48917
URL: http://svn.boost.org/trac/boost/changeset/48917

Log:
get things building again
Text files modified: 
   branches/proto/v4/boost/phoenix/bind/bind.hpp    |     2 +-                                      
   branches/proto/v4/boost/phoenix/core/actor.hpp   |    20 ++++++++++----------                    
   branches/proto/v4/boost/phoenix/core/limits.hpp  |    21 +++++++++++++++------                   
   branches/proto/v4/boost/phoenix/scope/lambda.hpp |     4 ++--                                    
   4 files changed, 28 insertions(+), 19 deletions(-)

Modified: branches/proto/v4/boost/phoenix/bind/bind.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/bind/bind.hpp	(original)
+++ branches/proto/v4/boost/phoenix/bind/bind.hpp	2008-09-22 00:47:01 EDT (Mon, 22 Sep 2008)
@@ -46,7 +46,7 @@
         >::type const
         bind(Fun const &fun)
         {
-            return proto::implicit_expr(fun);
+            return proto::make_expr<proto::tag::function, detail::domain>(boost::ref(fun));
         }
 
         #define BOOST_PP_ITERATION_PARAMS_1                                             \

Modified: branches/proto/v4/boost/phoenix/core/actor.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/actor.hpp	(original)
+++ branches/proto/v4/boost/phoenix/core/actor.hpp	2008-09-22 00:47:01 EDT (Mon, 22 Sep 2008)
@@ -243,6 +243,16 @@
             {};
         };
 
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        struct INVALID_LAMBDA_EXPRESSION
+          : mpl::false_
+        {};
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        struct VALID_LAMBDA_EXPRESSION
+          : mpl::true_
+        {};
+
         namespace detail
         {
             ////////////////////////////////////////////////////////////////////////////////////////
@@ -427,16 +437,6 @@
             }
         }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////
-        struct INVALID_LAMBDA_EXPRESSION
-          : mpl::false_
-        {};
-
-        ////////////////////////////////////////////////////////////////////////////////////////////
-        struct VALID_LAMBDA_EXPRESSION
-          : mpl::true_
-        {};
-
         namespace actorns_
         {
             ////////////////////////////////////////////////////////////////////////////////////////

Modified: branches/proto/v4/boost/phoenix/core/limits.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/limits.hpp	(original)
+++ branches/proto/v4/boost/phoenix/core/limits.hpp	2008-09-22 00:47:01 EDT (Mon, 22 Sep 2008)
@@ -7,9 +7,6 @@
 #ifndef PHOENIX_CORE_LIMITS_HPP
 #define PHOENIX_CORE_LIMITS_HPP
 
-#include <boost/preprocessor/selection/min.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-
 #if !defined(PHOENIX_LIMIT)
 # define PHOENIX_LIMIT 10
 #endif
@@ -35,7 +32,11 @@
 #endif
 
 #if !defined(BOOST_PROTO_MAX_FUNCTION_CALL_ARITY)
-# define BOOST_PROTO_MAX_FUNCTION_CALL_ARITY BOOST_PP_MIN(PHOENIX_LIMIT, 6)
+# if PHOENIX_LIMIT < 6
+#  define BOOST_PROTO_MAX_FUNCTION_CALL_ARITY PHOENIX_LIMIT
+# else
+#  define BOOST_PROTO_MAX_FUNCTION_CALL_ARITY 6
+# endif
 #endif
 
 #if defined(BOOST_PROTO_MAX_ARITY)
@@ -43,7 +44,11 @@
 #  error BOOST_PROTO_MAX_ARITY must be at least as large as PHOENIX_LIMIT
 # endif
 #else
-# define BOOST_PROTO_MAX_ARITY BOOST_PP_MAX(PHOENIX_LIMIT, 5)
+# if PHOENIX_LIMIT > 5
+#  define BOOST_PROTO_MAX_ARITY PHOENIX_LIMIT
+# else
+#  define BOOST_PROTO_MAX_ARITY 5
+# endif
 #endif
 
 #if defined(BOOST_MPL_LIMIT_METAFUNCTION_ARITY)
@@ -51,7 +56,11 @@
 #  error BOOST_MPL_LIMIT_METAFUNCTION_ARITY must be at least as large as PHOENIX_LIMIT
 # endif
 #else
-# define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PP_MAX(PHOENIX_LIMIT, 5)
+# if PHOENIX_LIMIT > 5
+#  define BOOST_MPL_LIMIT_METAFUNCTION_ARITY PHOENIX_LIMIT
+# else
+#  define BOOST_MPL_LIMIT_METAFUNCTION_ARITY 5
+# endif
 #endif
 
 //// this include will bring in mpl::vectorN and

Modified: branches/proto/v4/boost/phoenix/scope/lambda.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/scope/lambda.hpp	(original)
+++ branches/proto/v4/boost/phoenix/scope/lambda.hpp	2008-09-22 00:47:01 EDT (Mon, 22 Sep 2008)
@@ -104,8 +104,8 @@
         struct extension<tag::lambda_, SubGrammar>
           : proto::when<
                 proto::unary_expr<tag::lambda_, evaluator<SubGrammar> >
-              , proto::_make_expr<tag::with_state, detail::domain>(
-                    proto::call<proto::_make_expr<proto::tag::terminal, detail::domain>(proto::_byval(proto::_state))>
+              , proto::functional::make_expr<tag::with_state, detail::domain>(
+                    proto::call<proto::functional::make_expr<proto::tag::terminal, detail::domain>(proto::_byval(proto::_state))>
                   , proto::_child
                 )
             >