diff --git a/include/boost/mpl/aux_/fold_impl_body.hpp b/include/boost/mpl/aux_/fold_impl_body.hpp index 0321f0d..f17fccc 100644 --- a/include/boost/mpl/aux_/fold_impl_body.hpp +++ b/include/boost/mpl/aux_/fold_impl_body.hpp @@ -34,7 +34,7 @@ , BOOST_PP_CAT(state,i) \ , AUX778076_FOLD_IMPL_OP(BOOST_PP_CAT(iter,i)) \ >::type BOOST_PP_CAT(state,BOOST_PP_INC(i)); \ - typedef typename next::type \ + typedef typename mpl::next::type \ BOOST_PP_CAT(iter,BOOST_PP_INC(i)); \ /**/ @@ -106,7 +106,7 @@ template< struct AUX778076_FOLD_IMPL_NAME<-1,First,Last,State,ForwardOp> : AUX778076_FOLD_IMPL_NAME< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type , ForwardOp @@ -140,7 +140,7 @@ struct AUX778076_FOLD_IMPL_NAME { typedef AUX778076_FOLD_IMPL_NAME< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type , ForwardOp @@ -268,7 +268,7 @@ struct BOOST_PP_CAT(AUX778076_FOLD_IMPL_NAME_PREFIX,_step) { // can't inherit here - it breaks MSVC 7.0 typedef AUX778076_FOLD_CHUNK_NAME<-1>::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp index 8bb09d0..7a07414 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_fold_step { typedef reverse_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp index 16477eb..39a4057 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_iter_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_iter_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_iter_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_iter_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_iter_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_iter_fold_step { typedef reverse_iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp index 8bb09d0..7a07414 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_fold_step { typedef reverse_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp index 16477eb..39a4057 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_iter_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_iter_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_iter_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_iter_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_iter_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_iter_fold_step { typedef reverse_iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp index ecf781b..c468684 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -200,7 +200,7 @@ struct reverse_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp index 0d00792..658f92a 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_iter_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_iter_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_iter_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_iter_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_iter_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -200,7 +200,7 @@ struct reverse_iter_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp index ecf781b..c468684 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -200,7 +200,7 @@ struct reverse_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp index 0d00792..658f92a 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_iter_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_iter_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_iter_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_iter_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_iter_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -200,7 +200,7 @@ struct reverse_iter_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp index cd949cb..4b3c690 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp @@ -63,7 +63,7 @@ template<> struct fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -92,9 +92,9 @@ template<> struct fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -123,11 +123,11 @@ template<> struct fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -156,13 +156,13 @@ template<> struct fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -267,7 +267,7 @@ template< struct fold_step { typedef fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp index d93b635..69aadc4 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp @@ -63,7 +63,7 @@ template<> struct iter_fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -92,9 +92,9 @@ template<> struct iter_fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -123,11 +123,11 @@ template<> struct iter_fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -156,13 +156,13 @@ template<> struct iter_fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -267,7 +267,7 @@ template< struct iter_fold_step { typedef iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp index 42ecdf1..adf15b6 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp @@ -67,7 +67,7 @@ template<> struct reverse_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -99,9 +99,9 @@ template<> struct reverse_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -136,11 +136,11 @@ template<> struct reverse_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -176,13 +176,13 @@ template<> struct reverse_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -220,13 +220,13 @@ struct reverse_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -310,7 +310,7 @@ template< struct reverse_fold_step { typedef reverse_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp index 7dd5a06..208ad97 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp @@ -67,7 +67,7 @@ template<> struct reverse_iter_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -99,9 +99,9 @@ template<> struct reverse_iter_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -136,11 +136,11 @@ template<> struct reverse_iter_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -176,13 +176,13 @@ template<> struct reverse_iter_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -220,13 +220,13 @@ struct reverse_iter_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -310,7 +310,7 @@ template< struct reverse_iter_fold_step { typedef reverse_iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp index c0aca30..58066d8 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp @@ -55,7 +55,7 @@ template<> struct fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -76,9 +76,9 @@ template<> struct fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -99,11 +99,11 @@ template<> struct fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -124,13 +124,13 @@ template<> struct fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -219,7 +219,7 @@ template< struct fold_step { typedef fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp index 6177d99..50ea754 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp @@ -55,7 +55,7 @@ template<> struct iter_fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -76,9 +76,9 @@ template<> struct iter_fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -99,11 +99,11 @@ template<> struct iter_fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -124,13 +124,13 @@ template<> struct iter_fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -219,7 +219,7 @@ template< struct iter_fold_step { typedef iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp index 8bb09d0..7a07414 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_fold_step { typedef reverse_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp index 16477eb..39a4057 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_iter_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_iter_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_iter_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_iter_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_iter_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_iter_fold_step { typedef reverse_iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp index ecf781b..c468684 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -200,7 +200,7 @@ struct reverse_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp index 0d00792..658f92a 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_iter_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_iter_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_iter_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_iter_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_iter_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -200,7 +200,7 @@ struct reverse_iter_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp index c0aca30..58066d8 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp @@ -55,7 +55,7 @@ template<> struct fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -76,9 +76,9 @@ template<> struct fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -99,11 +99,11 @@ template<> struct fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -124,13 +124,13 @@ template<> struct fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -219,7 +219,7 @@ template< struct fold_step { typedef fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp index 6177d99..50ea754 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp @@ -55,7 +55,7 @@ template<> struct iter_fold_chunk<1> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -76,9 +76,9 @@ template<> struct iter_fold_chunk<2> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -99,11 +99,11 @@ template<> struct iter_fold_chunk<3> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -124,13 +124,13 @@ template<> struct iter_fold_chunk<4> typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -219,7 +219,7 @@ template< struct iter_fold_step { typedef iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp index 8bb09d0..7a07414 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_fold_step { typedef reverse_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp index 16477eb..39a4057 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp @@ -59,7 +59,7 @@ template<> struct reverse_iter_fold_chunk<1> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -83,9 +83,9 @@ template<> struct reverse_iter_fold_chunk<2> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -112,11 +112,11 @@ template<> struct reverse_iter_fold_chunk<3> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -144,13 +144,13 @@ template<> struct reverse_iter_fold_chunk<4> typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -180,13 +180,13 @@ struct reverse_iter_fold_chunk typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -262,7 +262,7 @@ template< struct reverse_iter_fold_step { typedef reverse_iter_fold_chunk< -1 >::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp index ecf781b..c468684 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -200,7 +200,7 @@ struct reverse_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp index 0d00792..658f92a 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_iter_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_iter_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_iter_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_iter_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_iter_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -200,7 +200,7 @@ struct reverse_iter_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp index 00c2e55..9e7a293 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp @@ -47,7 +47,7 @@ struct fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp, state0, typename deref::type >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, state1, typename deref::type >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, state2, typename deref::type >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, state3, typename deref::type >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct fold_impl< -1,First,Last,State,ForwardOp > : fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp index c25f136..805790e 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp @@ -47,7 +47,7 @@ struct iter_fold_impl< 1,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef state1 state; @@ -65,9 +65,9 @@ struct iter_fold_impl< 2,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef state2 state; @@ -85,11 +85,11 @@ struct iter_fold_impl< 3,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef state3 state; @@ -107,13 +107,13 @@ struct iter_fold_impl< 4,First,Last,State,ForwardOp > typedef First iter0; typedef State state0; typedef typename apply2< ForwardOp,state0,iter0 >::type state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,state1,iter1 >::type state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,state2,iter2 >::type state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,state3,iter3 >::type state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef state4 state; @@ -158,7 +158,7 @@ template< struct iter_fold_impl< -1,First,Last,State,ForwardOp > : iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , ForwardOp diff --git a/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp index ecf781b..c468684 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp, fwd_state0, typename deref::type >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp, fwd_state1, typename deref::type >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp, fwd_state2, typename deref::type >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp, fwd_state3, typename deref::type >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_fold_impl< @@ -200,7 +200,7 @@ struct reverse_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type>::type , BackwardOp diff --git a/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp index 0d00792..658f92a 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp @@ -51,7 +51,7 @@ struct reverse_iter_fold_impl< 1,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef fwd_state1 bkwd_state1; @@ -72,9 +72,9 @@ struct reverse_iter_fold_impl< 2,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef fwd_state2 bkwd_state2; @@ -98,11 +98,11 @@ struct reverse_iter_fold_impl< 3,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef fwd_state3 bkwd_state3; @@ -127,13 +127,13 @@ struct reverse_iter_fold_impl< 4,First,Last,State,BackwardOp,ForwardOp > typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef fwd_state4 bkwd_state4; @@ -160,13 +160,13 @@ struct reverse_iter_fold_impl typedef First iter0; typedef State fwd_state0; typedef typename apply2< ForwardOp,fwd_state0,iter0 >::type fwd_state1; - typedef typename next::type iter1; + typedef typename mpl::next::type iter1; typedef typename apply2< ForwardOp,fwd_state1,iter1 >::type fwd_state2; - typedef typename next::type iter2; + typedef typename mpl::next::type iter2; typedef typename apply2< ForwardOp,fwd_state2,iter2 >::type fwd_state3; - typedef typename next::type iter3; + typedef typename mpl::next::type iter3; typedef typename apply2< ForwardOp,fwd_state3,iter3 >::type fwd_state4; - typedef typename next::type iter4; + typedef typename mpl::next::type iter4; typedef reverse_iter_fold_impl< @@ -200,7 +200,7 @@ struct reverse_iter_fold_impl< -1,First,Last,State,BackwardOp,ForwardOp > { typedef reverse_iter_fold_impl< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2< ForwardOp,State,First >::type , BackwardOp diff --git a/include/boost/mpl/aux_/reverse_fold_impl_body.hpp b/include/boost/mpl/aux_/reverse_fold_impl_body.hpp index 7dc0348..6a12389 100644 --- a/include/boost/mpl/aux_/reverse_fold_impl_body.hpp +++ b/include/boost/mpl/aux_/reverse_fold_impl_body.hpp @@ -34,7 +34,7 @@ , BOOST_PP_CAT(fwd_state,n_) \ , AUX778076_FOLD_IMPL_OP(BOOST_PP_CAT(iter,n_)) \ >::type BOOST_PP_CAT(fwd_state,BOOST_PP_INC(n_)); \ - typedef typename next::type \ + typedef typename mpl::next::type \ BOOST_PP_CAT(iter,BOOST_PP_INC(n_)); \ /**/ @@ -137,7 +137,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,First,Last,State,BackwardOp,ForwardOp> { typedef AUX778076_FOLD_IMPL_NAME< -1 - , typename next::type + , typename mpl::next::type , Last , typename apply2::type , BackwardOp @@ -280,7 +280,7 @@ template< struct BOOST_PP_CAT(AUX778076_FOLD_IMPL_NAME_PREFIX,_step) { typedef AUX778076_FOLD_CHUNK_NAME<-1>::template result_< - typename next::type + typename mpl::next::type , Last , typename apply2::type , BackwardOp diff --git a/include/boost/mpl/list/aux_/pop_front.hpp b/include/boost/mpl/list/aux_/pop_front.hpp index 0ba4dfc..563c596 100644 --- a/include/boost/mpl/list/aux_/pop_front.hpp +++ b/include/boost/mpl/list/aux_/pop_front.hpp @@ -25,7 +25,7 @@ struct pop_front_impl< aux::list_tag > { template< typename List > struct apply { - typedef typename next::type type; + typedef typename mpl::next::type type; }; };