From d8f609deb6c4bbf513e568e2fe78b32118a1eda6 Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Mon, 7 Oct 2002 13:31:24 +0000 Subject: [PATCH] re-apply IRIX arg<> fix [SVN r15770] --- .../mpl/aux_/preprocessed/plain/basic_bind.hpp | 2 +- include/boost/mpl/aux_/preprocessed/plain/bind.hpp | 14 +++++++------- include/boost/mpl/bind.hpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp b/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp index 5a1b6dc..d86e51b 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp @@ -33,7 +33,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< diff --git a/include/boost/mpl/aux_/preprocessed/plain/bind.hpp b/include/boost/mpl/aux_/preprocessed/plain/bind.hpp index e08fdb1..20db753 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< @@ -108,7 +108,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_; @@ -156,7 +156,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_; @@ -209,7 +209,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_; @@ -267,7 +267,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_; @@ -330,7 +330,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_; @@ -399,7 +399,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/bind.hpp b/include/boost/mpl/bind.hpp index 4730285..cd66ab6 100644 --- a/include/boost/mpl/bind.hpp +++ b/include/boost/mpl/bind.hpp @@ -238,7 +238,7 @@ template< > struct resolve_bind_arg< arg,AUX_BIND_PARAMS(U) > { - typedef typename AUX_APPLY((arg, AUX_BIND_PARAMS(U)))::type type; + typedef typename AUX_APPLY((mpl::arg, AUX_BIND_PARAMS(U)))::type type; }; #if !defined(BOOST_MPL_NO_BIND_TEMPLATE) @@ -405,7 +405,7 @@ struct BOOST_PP_CAT(bind,i) private: # if !defined(BOOST_MPL_NO_UNNAMED_PLACEHOLDER_SUPPORT) - 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::type f_;