Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/phoenix/scope | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
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 @@ -96,22 +96,22 @@ 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> @@ -148,7 +148,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -248,7 +248,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -281,23 +281,23 @@ namespace boost { namespace phoenix 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 @@ -337,8 +337,8 @@ 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) 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 @@ -130,8 +130,8 @@ namespace boost { namespace phoenix 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) 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 @@ -57,7 +57,7 @@ namespace boost { namespace phoenix : mpl::false_ {}; } - + namespace detail { struct scope_is_nullary_actions @@ -88,8 +88,8 @@ namespace boost { namespace phoenix : 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; 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 @@ -52,22 +52,22 @@ namespace boost { namespace phoenix 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 @@ -101,7 +101,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -195,7 +195,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -226,23 +226,14 @@ namespace boost { namespace phoenix 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 @@ -277,8 +268,8 @@ 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/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 @@ -52,22 +52,22 @@ namespace boost { namespace phoenix 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 @@ -101,7 +101,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -195,7 +195,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -226,23 +226,14 @@ namespace boost { namespace phoenix 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 @@ -277,8 +268,8 @@ 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/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 @@ -52,22 +52,22 @@ namespace boost { namespace phoenix 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 @@ -101,7 +101,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -195,7 +195,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -226,23 +226,14 @@ namespace boost { namespace phoenix 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 @@ -277,8 +268,8 @@ 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/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 @@ -52,22 +52,22 @@ namespace boost { namespace phoenix 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 @@ -101,7 +101,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -195,7 +195,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -226,23 +226,14 @@ namespace boost { namespace phoenix 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 @@ -277,8 +268,8 @@ 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/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 @@ -52,22 +52,22 @@ namespace boost { namespace phoenix 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 @@ -101,7 +101,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type @@ -195,7 +195,7 @@ namespace boost { namespace phoenix >::type vars_type; - typedef typename + typedef typename detail::result_of::initialize_locals< vars_type , Context @@ -226,23 +226,14 @@ namespace boost { namespace phoenix 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 @@ -277,8 +268,8 @@ 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/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 @@ -35,20 +35,20 @@ namespace boost { namespace phoenix 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; |