From 8ce60cc0681091e6de17762f80495e500287c888 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Mon, 10 Jan 2011 09:49:12 +0000 Subject: [PATCH] code cleanup take 4 [SVN r67911] --- include/boost/phoenix/scope/lambda.hpp | 66 ++++++++++++++++---------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/include/boost/phoenix/scope/lambda.hpp b/include/boost/phoenix/scope/lambda.hpp index 8d0c4cb..74ae96b 100644 --- a/include/boost/phoenix/scope/lambda.hpp +++ b/include/boost/phoenix/scope/lambda.hpp @@ -63,7 +63,7 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< - typename boost::result_of< + typename functional::args::result< functional::args(Env) >::type >::type @@ -71,7 +71,7 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< - typename boost::result_of< + typename functional::actions::result< functional::actions(Env) >::type >::type @@ -120,16 +120,16 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< - typename boost::result_of< - functional::args(Env &) + typename functional::args::result< + functional::args(Env) >::type >::type args_type; typedef typename proto::detail::uncvref< - typename boost::result_of< - functional::actions(Env &) + typename functional::actions::result< + functional::actions(Env) >::type >::type actions_type; @@ -263,13 +263,17 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::args::result< + functional::args(Env) + >::type >::type args_type; typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::actions::result< + functional::actions(Env) + >::type >::type actions_type; @@ -291,12 +295,11 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< - typename boost::result_of< - rule::local_var_def_list( - typename proto::detail::uncvref::type & - , Env - ) - >::type + typename rule::local_var_def_list::impl< + typename proto::detail::uncvref::type & + , Env + , int + >::result_type >::type locals_type; @@ -306,13 +309,17 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::args::result< + functional::args(Env) + >::type >::type args_type; typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::actions::result< + functional::actions(Env) + >::type >::type actions_type; @@ -339,13 +346,17 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::args::result< + functional::args(Env) + >::type >::type args_type; typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::actions::result< + functional::actions(Env) + >::type >::type actions_type; @@ -375,12 +386,11 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< - typename boost::result_of< - rule::local_var_def_list( - Locals & - , Env & - ) - >::type + typename rule::local_var_def_list::impl< + Locals & + , Env + , int + >::result_type >::type locals_type; @@ -392,13 +402,17 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::args::result< + functional::args(Env) + >::type >::type args_type; typedef typename proto::detail::uncvref< - typename boost::result_of::type + typename functional::actions::result< + functional::actions(Env) + >::type >::type actions_type;