Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/phoenix/scope')
9 files changed, 151 insertions, 196 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/scope/lambda.hpp b/3rdParty/Boost/src/boost/phoenix/scope/lambda.hpp index 432edd9..8221966 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/lambda.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/lambda.hpp @@ -93,28 +93,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { @@ -145,13 +145,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -245,13 +245,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; @@ -278,29 +278,29 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef + /*typedef typename proto::detail::uncvref< typename result_of::actions<Context>::type >::type - actions_type; + actions_type;*/ typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef + /*typedef typename proto::detail::uncvref< typename proto::result_of::value<Map>::type >::type - map_type; - - typedef typename + map_type;*/ + + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; @@ -334,14 +334,14 @@ namespace boost { namespace phoenix } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; diff --git a/3rdParty/Boost/src/boost/phoenix/scope/let.hpp b/3rdParty/Boost/src/boost/phoenix/scope/let.hpp index 8c84571..f1b428c 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/let.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/let.hpp @@ -127,14 +127,14 @@ namespace boost { namespace phoenix : call<let_eval, Dummy> {}; template <typename Locals, typename Map> struct let_actor_gen { - let_actor_gen(Locals const & locals) - : locals(locals) + let_actor_gen(Locals const & locals_) + : locals(locals_) {} let_actor_gen(let_actor_gen const & o) : locals(o.locals) {} diff --git a/3rdParty/Boost/src/boost/phoenix/scope/local_variable.hpp b/3rdParty/Boost/src/boost/phoenix/scope/local_variable.hpp index ebc01c3..d62a5bb 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/local_variable.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/local_variable.hpp @@ -54,13 +54,13 @@ namespace boost { namespace phoenix { template <typename Key> struct is_nullary<custom_terminal<detail::local<Key> > > : mpl::false_ {}; } - + namespace detail { struct scope_is_nullary_actions { template <typename Rule, typename Dummy = void> struct when @@ -85,14 +85,14 @@ namespace boost { namespace phoenix template<typename Key> struct is_custom_terminal<detail::local<Key> > : mpl::true_ {}; - template <typename Key> - struct custom_terminal<detail::local<Key> > + template <typename Key> + struct custom_terminal<detail::local<Key> > { template <typename Sig> struct result; template <typename This, typename Local, typename Context> struct result<This(Local, Context)> diff --git a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_10.hpp b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_10.hpp index 333240e..754f2b9 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_10.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_10.hpp @@ -49,28 +49,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { typedef @@ -98,13 +98,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -192,13 +192,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; typedef @@ -223,29 +223,20 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef - typename proto::detail::uncvref< - typename proto::result_of::value<Map>::type - >::type - map_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); @@ -274,14 +265,14 @@ namespace boost { namespace phoenix return expression::lambda_actor<locals_type, map_type, Expr>::make(locals_type(), map_type(), expr); } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; template <typename Expr> typename expression::lambda_actor< diff --git a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_20.hpp b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_20.hpp index 7eefa43..d9a4bdd 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_20.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_20.hpp @@ -49,28 +49,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { typedef @@ -98,13 +98,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -192,13 +192,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; typedef @@ -223,29 +223,20 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef - typename proto::detail::uncvref< - typename proto::result_of::value<Map>::type - >::type - map_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); @@ -274,14 +265,14 @@ namespace boost { namespace phoenix return expression::lambda_actor<locals_type, map_type, Expr>::make(locals_type(), map_type(), expr); } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; template <typename Expr> typename expression::lambda_actor< diff --git a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_30.hpp b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_30.hpp index e18d622..e7f8b2a 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_30.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_30.hpp @@ -49,28 +49,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { typedef @@ -98,13 +98,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -192,13 +192,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; typedef @@ -223,29 +223,20 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef - typename proto::detail::uncvref< - typename proto::result_of::value<Map>::type - >::type - map_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); @@ -274,14 +265,14 @@ namespace boost { namespace phoenix return expression::lambda_actor<locals_type, map_type, Expr>::make(locals_type(), map_type(), expr); } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; template <typename Expr> typename expression::lambda_actor< diff --git a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_40.hpp b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_40.hpp index c291c62..11fb23e 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_40.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_40.hpp @@ -49,28 +49,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { typedef @@ -98,13 +98,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -192,13 +192,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; typedef @@ -223,29 +223,20 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef - typename proto::detail::uncvref< - typename proto::result_of::value<Map>::type - >::type - map_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); @@ -274,14 +265,14 @@ namespace boost { namespace phoenix return expression::lambda_actor<locals_type, map_type, Expr>::make(locals_type(), map_type(), expr); } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; template <typename Expr> typename expression::lambda_actor< diff --git a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_50.hpp b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_50.hpp index 30f5fef..2128eb4 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_50.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/preprocessed/lambda_50.hpp @@ -49,28 +49,28 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename OuterEnv, typename Locals, typename Map, typename Lambda, typename Context> typename result<lambda_eval(OuterEnv const &, Locals const &, Map const &, Lambda const &, Context const &)>::type operator()(OuterEnv const & outer_env, Locals const & locals, Map const &, Lambda const & lambda, Context const & ctx) const { typedef @@ -98,13 +98,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type , map_type > env(phoenix::env(ctx), proto::value(outer_env), proto::value(locals)); @@ -192,13 +192,13 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; typedef @@ -223,29 +223,20 @@ namespace boost { namespace phoenix { typedef typename proto::detail::uncvref< typename result_of::env<Context>::type >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< typename proto::result_of::value<Vars>::type >::type vars_type; - typedef - typename proto::detail::uncvref< - typename proto::result_of::value<Map>::type - >::type - map_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); @@ -274,14 +265,14 @@ namespace boost { namespace phoenix return expression::lambda_actor<locals_type, map_type, Expr>::make(locals_type(), map_type(), expr); } }; template <typename Locals, typename Map> struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) : locals(o.locals) {}; template <typename Expr> typename expression::lambda_actor< diff --git a/3rdParty/Boost/src/boost/phoenix/scope/scoped_environment.hpp b/3rdParty/Boost/src/boost/phoenix/scope/scoped_environment.hpp index a53b4e5..5fcb245 100644 --- a/3rdParty/Boost/src/boost/phoenix/scope/scoped_environment.hpp +++ b/3rdParty/Boost/src/boost/phoenix/scope/scoped_environment.hpp @@ -32,26 +32,26 @@ namespace boost { namespace phoenix typedef Env env_type; typedef OuterEnv outer_env_type; typedef Locals locals_type; typedef Map map_type; scoped_environment( - Env const & env - , OuterEnv const &outer_env - , Locals const &locals + Env const & env_ + , OuterEnv const &outer_env_ + , Locals const &locals_ ) - : env(env) - , outer_env(outer_env) - , locals(locals) + : env(env_) + , outer_env(outer_env_) + , locals(locals_) {} - scoped_environment(scoped_environment const & o) - : env(o.env) + scoped_environment(scoped_environment const & o) + : env(o.env) , outer_env(o.outer_env) - , locals(o.locals) - {}; + , locals(o.locals) + {}; Env const & env; OuterEnv const & outer_env; Locals const & locals; typedef typename |