Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/phoenix/statement/for.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/statement/for.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/phoenix/statement/for.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -39,12 +39,12 @@ Init const& init , Cond const& cond , Step const& step - , Do const& do_ + , Do const& do_it , Context const & ctx ) const { for(boost::phoenix::eval(init, ctx); boost::phoenix::eval(cond, ctx); boost::phoenix::eval(step, ctx)) - boost::phoenix::eval(do_, ctx); + boost::phoenix::eval(do_it, ctx); } }; @@ -56,17 +56,17 @@ template <typename Init, typename Cond, typename Step> struct for_gen { - for_gen(Init const& init, Cond const& cond, Step const& step) - : init(init), cond(cond), step(step) {} + for_gen(Init const& init_, Cond const& cond_, Step const& step_) + : init(init_), cond(cond_), step(step_) {} template <typename Do> typename expression::for_<Init, Cond, Step, Do>::type const - operator[](Do const& do_) const + operator[](Do const& do_it) const { return expression:: for_<Init, Cond, Step, Do>:: - make(init, cond, step, do_); + make(init, cond, step, do_it); } Init init;