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/let.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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/let.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/scope/let.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ -98,72 +98,72 @@ namespace boost { namespace phoenix typedef typename proto::detail::uncvref< typename proto::result_of::value<Map>::type >::type map_type; typedef typename detail::result_of::initialize_locals< vars_type , Context >::type locals_type; locals_type locals = initialize_locals(proto::value(vars), ctx); scoped_environment< env_type , env_type , locals_type , map_type > env(phoenix::env(ctx), phoenix::env(ctx), locals); return eval(expr, phoenix::context(env, phoenix::actions(ctx))); } }; template <typename Dummy> struct default_actions::when<rule::let_, Dummy> : 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) {} template <typename Expr> typename expression::let_< Locals , Map , Expr >::type const operator[](Expr const & expr) const { return expression::let_<Locals, Map, Expr>::make(locals, Map(), expr); } Locals locals; }; #define BOOST_PHOENIX_SCOPE_ACTOR_GEN_NAME let_actor_gen #define BOOST_PHOENIX_SCOPE_ACTOR_GEN_FUNCTION let #define BOOST_PHOENIX_SCOPE_ACTOR_GEN_CONST #include <boost/phoenix/scope/detail/local_gen.hpp> #undef BOOST_PHOENIX_SCOPE_ACTOR_GEN_NAME #undef BOOST_PHOENIX_SCOPE_ACTOR_GEN_FUNCTION #undef BOOST_PHOENIX_SCOPE_ACTOR_GEN_CONST template <typename Dummy> struct is_nullary::when<rule::let_, Dummy> : proto::make< mpl::and_< proto::fold< proto::call<proto::_value(proto::_child_c<0>)> , proto::make<mpl::true_()> |