Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/phoenix/scope/this.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/phoenix/scope/this.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/phoenix/scope/this.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -62,56 +62,56 @@ template <typename This, typename A0, typename Context> struct result<This(A0, Context)> { - typedef - typename proto::detail::uncvref< - typename result_of::env< - Context - >::type - >::type - outer_env_type; - - typedef - typename remove_pointer< - typename remove_reference< - typename fusion::result_of::at_c< - outer_env_type - , 0 - >::type - >::type - >::type - actor_type; - - typedef - typename result_of::eval< - A0 const & - , Context const & - >::type - a0_type; + typedef + typename proto::detail::uncvref< + typename result_of::env< + Context + >::type + >::type + outer_env_type; - typedef - vector2<actor_type const *, a0_type> - inner_env_type; + typedef + typename remove_pointer< + typename remove_reference< + typename fusion::result_of::at_c< + outer_env_type + , 0 + >::type + >::type + >::type + actor_type; - typedef - scoped_environment< - inner_env_type - , outer_env_type - , vector0<> - , detail::map_local_index_to_tuple<> - > - env_type; - - typedef - typename result_of::eval< - actor_type const & - , typename result_of::context< - inner_env_type - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + A0 const & + , Context const & + >::type + a0_type; + + typedef + vector2<actor_type const *, a0_type> + inner_env_type; + + typedef + scoped_environment< + inner_env_type + , outer_env_type + , vector0<> + , detail::map_local_index_to_tuple<> + > + env_type; + + typedef + typename result_of::eval< + actor_type const & + , typename result_of::context< + inner_env_type + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template <typename A0, typename Context> @@ -121,50 +121,50 @@ //std::cout << typeid(checker).name() << "\n"; //std::cout << typeid(checker).name() << "\n"; - typedef - typename proto::detail::uncvref< - typename result_of::env< - Context - >::type - >::type - outer_env_type; - - typedef - typename remove_pointer< - typename remove_reference< - typename fusion::result_of::at_c< - outer_env_type - , 0 - >::type - >::type - >::type - actor_type; - - typedef - typename result_of::eval< - A0 const & - , Context const & - >::type - a0_type; + typedef + typename proto::detail::uncvref< + typename result_of::env< + Context + >::type + >::type + outer_env_type; - typedef - vector2<actor_type const *, a0_type> - inner_env_type; + typedef + typename remove_pointer< + typename remove_reference< + typename fusion::result_of::at_c< + outer_env_type + , 0 + >::type + >::type + >::type + actor_type; - typedef - scoped_environment< - inner_env_type - , outer_env_type - , vector0<> - , detail::map_local_index_to_tuple<> - > - env_type; + typedef + typename result_of::eval< + A0 const & + , Context const & + >::type + a0_type; - inner_env_type inner_env = {fusion::at_c<0>(phoenix::env(ctx)), phoenix::eval(a0, ctx)}; - vector0<> locals; - env_type env(inner_env, phoenix::env(ctx), locals); + typedef + vector2<actor_type const *, a0_type> + inner_env_type; - return phoenix::eval(*fusion::at_c<0>(phoenix::env(ctx)), phoenix::context(inner_env, phoenix::actions(ctx))); + typedef + scoped_environment< + inner_env_type + , outer_env_type + , vector0<> + , detail::map_local_index_to_tuple<> + > + env_type; + + inner_env_type inner_env = {fusion::at_c<0>(phoenix::env(ctx)), phoenix::eval(a0, ctx)}; + vector0<> locals; + env_type env(inner_env, phoenix::env(ctx), locals); + + return phoenix::eval(*fusion::at_c<0>(phoenix::env(ctx)), phoenix::context(inner_env, phoenix::actions(ctx))); //return (*fusion::at_c<0>(phoenix::env(ctx)))(eval(a0, ctx)); } }; @@ -174,17 +174,17 @@ : call<this_eval> {}; - template <typename Dummy> + template <typename Dummy> struct is_nullary::when<rule::this_, Dummy> : proto::make<mpl::false_()> {}; - template <typename A0> - typename expression::this_<A0>::type const - this_(A0 const & a0) - { - return expression::this_<A0>::make(a0); - } + template <typename A0> + typename expression::this_<A0>::type const + this_(A0 const & a0) + { + return expression::this_<A0>::make(a0); + } }}