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 @@ -97,20 +97,20 @@ namespace boost { namespace phoenix 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; }; @@ -149,5 +149,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -249,5 +249,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -282,9 +282,9 @@ namespace boost { namespace phoenix >::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< @@ -292,11 +292,11 @@ namespace boost { namespace phoenix >::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 @@ -338,6 +338,6 @@ namespace boost { namespace phoenix struct lambda_actor_gen<Locals, Map> { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(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 @@ -131,6 +131,6 @@ namespace boost { namespace phoenix struct let_actor_gen { - let_actor_gen(Locals const & locals) - : locals(locals) + let_actor_gen(Locals const & locals_) + : locals(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 @@ -58,5 +58,5 @@ namespace boost { namespace phoenix {}; } - + namespace detail { @@ -89,6 +89,6 @@ namespace boost { namespace phoenix {}; - template <typename Key> - struct custom_terminal<detail::local<Key> > + template <typename Key> + struct custom_terminal<detail::local<Key> > { template <typename Sig> 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 @@ -53,20 +53,20 @@ namespace boost { namespace phoenix >::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> @@ -102,5 +102,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -196,5 +196,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -227,9 +227,5 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< @@ -237,11 +233,6 @@ namespace boost { namespace phoenix >::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 @@ -278,6 +269,6 @@ namespace boost { namespace phoenix 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) 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 @@ -53,20 +53,20 @@ namespace boost { namespace phoenix >::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> @@ -102,5 +102,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -196,5 +196,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -227,9 +227,5 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< @@ -237,11 +233,6 @@ namespace boost { namespace phoenix >::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 @@ -278,6 +269,6 @@ namespace boost { namespace phoenix 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) 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 @@ -53,20 +53,20 @@ namespace boost { namespace phoenix >::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> @@ -102,5 +102,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -196,5 +196,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -227,9 +227,5 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< @@ -237,11 +233,6 @@ namespace boost { namespace phoenix >::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 @@ -278,6 +269,6 @@ namespace boost { namespace phoenix 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) 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 @@ -53,20 +53,20 @@ namespace boost { namespace phoenix >::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> @@ -102,5 +102,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -196,5 +196,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -227,9 +227,5 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< @@ -237,11 +233,6 @@ namespace boost { namespace phoenix >::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 @@ -278,6 +269,6 @@ namespace boost { namespace phoenix 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) 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 @@ -53,20 +53,20 @@ namespace boost { namespace phoenix >::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> @@ -102,5 +102,5 @@ namespace boost { namespace phoenix env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type @@ -196,5 +196,5 @@ namespace boost { namespace phoenix vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type @@ -227,9 +227,5 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename proto::detail::uncvref< - typename result_of::actions<Context>::type - >::type - actions_type; + typedef typename proto::detail::uncvref< @@ -237,11 +233,6 @@ namespace boost { namespace phoenix >::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 @@ -278,6 +269,6 @@ namespace boost { namespace phoenix 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) 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 @@ -36,18 +36,18 @@ namespace boost { namespace phoenix 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; |