From d8c5155e1008779602d13aee95a7f9fa5486eec1 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Thu, 3 Oct 2002 23:23:54 +0000 Subject: [PATCH] changes from trunk merged to enable MIPSpro compilations [SVN r15699] --- include/boost/mpl/aux_/preprocessed/plain/bind.hpp | 14 +++++++------- include/boost/mpl/find_if.hpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/mpl/aux_/preprocessed/plain/bind.hpp b/include/boost/mpl/aux_/preprocessed/plain/bind.hpp index 308b982..38bd55c 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/bind.hpp @@ -52,7 +52,7 @@ template< > struct resolve_bind_arg< arg,U1,U2,U3,U4,U5 > { - typedef typename arg::template apply< U1,U2,U3,U4,U5 >::type type; + typedef typename mpl::arg::template apply< U1,U2,U3,U4,U5 >::type type; }; template< @@ -100,7 +100,7 @@ struct bind0 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; @@ -146,7 +146,7 @@ struct bind1 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; @@ -197,7 +197,7 @@ struct bind2 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; @@ -253,7 +253,7 @@ struct bind3 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; @@ -314,7 +314,7 @@ struct bind4 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; @@ -381,7 +381,7 @@ struct bind5 struct apply { private: - typedef aux::replace_unnamed_arg< F,arg<1> > r0; + typedef aux::replace_unnamed_arg< F,mpl::arg<1> > r0; typedef typename r0::type a0; typedef typename r0::next_arg n1; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; diff --git a/include/boost/mpl/find_if.hpp b/include/boost/mpl/find_if.hpp index a036749..0bb3c3c 100644 --- a/include/boost/mpl/find_if.hpp +++ b/include/boost/mpl/find_if.hpp @@ -69,7 +69,7 @@ struct find_if typedef typename aux::iter_fold_if_impl< first_ , pred_ - , arg<1> + , mpl::arg<1> , aux::find_if_pred , void , always