[Boost-commit] svn:boost r66645 - in sandbox/SOC/2010/phoenix3/boost/phoenix: core operator

Subject: [Boost-commit] svn:boost r66645 - in sandbox/SOC/2010/phoenix3/boost/phoenix: core operator
From: thom.heller_at_[hidden]
Date: 2010-11-19 10:01:56

Author: theller
Date: 2010-11-19 10:01:52 EST (Fri, 19 Nov 2010)
New Revision: 66645
URL: http://svn.boost.org/trac/boost/changeset/66645

Log:
some cleaning up
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/unpack.hpp     |    65 ----------------------------------------
   sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp |    28 +----------------                       
   2 files changed, 2 insertions(+), 91 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/unpack.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/unpack.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/unpack.hpp	2010-11-19 10:01:52 EST (Fri, 19 Nov 2010)
@@ -79,71 +79,6 @@
             >::value>
         struct unpack_impl;
         
-        /*
-        template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R>
-        struct unpack_impl<Expr, State, Data, Seq, Fun, R(), 0>
-            : proto::transform_impl<Expr, State, Data>
-        {
-            struct fun_type : proto::when<proto::_, Fun> {};
-            
-            typedef proto::call<R()> which;
-
-            typedef typename which::template impl<Expr, State, Data>::result_type result_type;
-
-            result_type
-            operator()(
-                typename unpack_impl::expr_param e
-              , typename unpack_impl::state_param s
-              , typename unpack_impl::data_param d
-            ) const
-            {
-                return typename which::template impl<Expr, State, Data>()(e, s, d);
-            }
-        };
-        
-        template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R>
-        struct unpack_impl<Expr, State, Data, Seq, Fun, R(unpack), 0>
-            : proto::transform_impl<Expr, State, Data>
-        {
-            struct fun_type : proto::when<proto::_, Fun> {};
-            
-            typedef proto::call<R()> which;
-
-            typedef typename which::template impl<Expr, State, Data>::result_type result_type;
-
-            result_type
-            operator()(
-                typename unpack_impl::expr_param e
-              , typename unpack_impl::state_param s
-              , typename unpack_impl::data_param d
-            ) const
-            {
-                return typename which::template impl<Expr, State, Data>()(e, s, d);
-            }
-        };
-        
-        template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R, typename A0>
-        struct unpack_impl<Expr, State, Data, Seq, Fun, R(A0, unpack), 0>
-            : proto::transform_impl<Expr, State, Data>
-        {
-            struct fun_type : proto::when<proto::_, Fun> {};
-            
-            typedef proto::call<R(A0)> which;
-
-            typedef typename which::template impl<Expr, State, Data>::result_type result_type;
-
-            result_type
-            operator()(
-                typename unpack_impl::expr_param e
-              , typename unpack_impl::state_param s
-              , typename unpack_impl::data_param d
-            ) const
-            {
-                return typename which::template impl<Expr, State, Data>()(e, s, d);
-            }
-        };
-        */
-
 #define M5(_, N, __) fun_type(fusion_at_c< N >(Seq))
         
         #define M1(Z, N, ARITY) \

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp	2010-11-19 10:01:52 EST (Fri, 19 Nov 2010)
@@ -3,20 +3,12 @@
 #ifndef PHOENIX_OPERATOR_MEMBER_HPP
 #define PHOENIX_OPERATOR_MEMBER_HPP
 
-/*#include <boost/get_pointer.hpp>
-#include <boost/phoenix/core/actor.hpp>
-#include <boost/phoenix/core/compose.hpp>
-#include <boost/phoenix/core/domain.hpp>
-#include <boost/phoenix/core/mem_obj_ptr.hpp>
-#include <boost/proto/make_expr.hpp>
-#include <boost/proto/tags.hpp>
-#include <boost/type_traits/is_member_object_pointer.hpp>*/
+#include <boost/get_pointer.hpp>
 #include <boost/phoenix/core/expression.hpp>
 #include <boost/phoenix/core/unpack.hpp>
 #include <boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp>
 #include <boost/phoenix/support/iterate.hpp>
 #include <boost/type_traits/is_member_function_pointer.hpp>
-#include <boost/get_pointer.hpp>
 
 namespace boost { namespace phoenix
 {
@@ -26,20 +18,6 @@
 
     PHOENIX_DEFINE_EXPRESSION_VARARG(mem_fun_ptr, (meta_grammar), PHOENIX_LIMIT)
 
-    /*
-	namespace rule
-	{
-		struct mem_fun_ptr
-			: proto::nary_expr<tag::mem_fun_ptr, proto::vararg<meta_grammar> >
-		{};
-	}
-
-	template <typename Dummy>
-	struct meta_grammar::case_<tag::mem_fun_ptr, Dummy>
-		: proto::when<rule::mem_fun_ptr, proto::external_transform>
-	{};
-    */
-
         template <typename Object, typename MemPtr>
     typename enable_if<
         is_member_function_pointer<MemPtr>
@@ -53,8 +31,6 @@
         struct mem_fun_ptr_eval
                 : proto::callable
         {
-        //typedef int result_type;
-
         template<typename Sig>
         struct result;
 
@@ -74,7 +50,7 @@
 
     template <typename Dummy>
     struct default_actions::when<rule::mem_fun_ptr, Dummy>
-        : proto::call<mem_fun_ptr_eval(_env, unpack)>//(proto::_, evaluator(proto::_, _env)))>
+        : proto::call<mem_fun_ptr_eval(_env, unpack)>
     {};
 }}