changes from trunk merged to enable MIPSpro compilations

[SVN r15699]
This commit is contained in:
Ralf W. Grosse-Kunstleve
2002-10-03 23:23:54 +00:00
parent c570dfb493
commit d8c5155e10
2 changed files with 8 additions and 8 deletions

View File

@@ -52,7 +52,7 @@ template<
> >
struct resolve_bind_arg< arg<N>,U1,U2,U3,U4,U5 > struct resolve_bind_arg< arg<N>,U1,U2,U3,U4,U5 >
{ {
typedef typename arg<N>::template apply< U1,U2,U3,U4,U5 >::type type; typedef typename mpl::arg<N>::template apply< U1,U2,U3,U4,U5 >::type type;
}; };
template< template<
@@ -100,7 +100,7 @@ struct bind0
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;
@@ -146,7 +146,7 @@ struct bind1
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;
@@ -197,7 +197,7 @@ struct bind2
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;
@@ -253,7 +253,7 @@ struct bind3
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;
@@ -314,7 +314,7 @@ struct bind4
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;
@@ -381,7 +381,7 @@ struct bind5
struct apply struct apply
{ {
private: 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::type a0;
typedef typename r0::next_arg n1; typedef typename r0::next_arg n1;
typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_; typedef typename aux::resolve_bind_arg< a0,U1,U2,U3,U4,U5 >::type f_;

View File

@@ -69,7 +69,7 @@ struct find_if
typedef typename aux::iter_fold_if_impl< typedef typename aux::iter_fold_if_impl<
first_ first_
, pred_ , pred_
, arg<1> , mpl::arg<1>
, aux::find_if_pred<last_> , aux::find_if_pred<last_>
, void , void
, always<false_c> , always<false_c>