MIPSpro compatibility

[SVN r17776]
This commit is contained in:
Ralf W. Grosse-Kunstleve
2003-03-08 01:47:40 +00:00
parent 5a797f50bb
commit 3be28cb1b0
6 changed files with 11 additions and 11 deletions

View File

@@ -27,7 +27,7 @@
#if !defined(AUX_WRAPPER_NAME)
# define AUX_WRAPPER_NAME BOOST_PP_CAT(AUX_WRAPPER_VALUE_TYPE,_)
# define AUX_WRAPPER_PARAMS(N) BOOST_MPL_AUX_NTTP_DECL(AUX_WRAPPER_VALUE_TYPE, N)
# define AUX_WRAPPER_INST(value) AUX_WRAPPER_NAME< value >
# define AUX_WRAPPER_INST(value) mpl::AUX_WRAPPER_NAME< value >
#endif
namespace boost { namespace mpl {
@@ -36,7 +36,7 @@ template< AUX_WRAPPER_PARAMS(N) >
struct AUX_WRAPPER_NAME
{
BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, value = N);
typedef AUX_WRAPPER_NAME type;
typedef struct AUX_WRAPPER_NAME type;
typedef AUX_WRAPPER_VALUE_TYPE value_type;
// have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),

View File

@@ -101,7 +101,7 @@ struct iter_fold_if_forward_step
typedef typename BOOST_MPL_AUX_APPLY2(Predicate,State,Iterator)::type not_last;
typedef typename iter_fold_if_step_impl<
BOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
>::template result_< Iterator,State,ForwardOp,next<Iterator> > impl_;
>::template result_< Iterator,State,ForwardOp,mpl::next<Iterator> > impl_;
typedef typename impl_::state state;
typedef typename impl_::iterator iterator;

View File

@@ -124,7 +124,7 @@ template<> struct lambda_impl<i,true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< BOOST_PP_CAT(bind,i)<
typedef mpl::protect< BOOST_PP_CAT(bind,i)<
f_
BOOST_MPL_PP_REPEAT(i, AUX_LAMBDA_INVOCATION, T)
> > type;

View File

@@ -55,7 +55,7 @@ struct iter_fold_if_forward_step
typedef typename Predicate::template apply< State,Iterator >::type not_last;
typedef typename iter_fold_if_step_impl<
BOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
>::template result_< Iterator,State,ForwardOp,next<Iterator> > impl_;
>::template result_< Iterator,State,ForwardOp,mpl::next<Iterator> > impl_;
typedef typename impl_::state state;
typedef typename impl_::iterator iterator;

View File

@@ -31,7 +31,7 @@ template<> struct lambda_impl<1, true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< bind1<
typedef mpl::protect< bind1<
f_
, typename lambda< typename F::arg1, false >::type
> > type;
@@ -56,7 +56,7 @@ template<> struct lambda_impl<2, true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< bind2<
typedef mpl::protect< bind2<
f_
,typename lambda< typename F::arg1, false >::type, typename lambda< typename F::arg2, false >::type
@@ -82,7 +82,7 @@ template<> struct lambda_impl<3, true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< bind3<
typedef mpl::protect< bind3<
f_
,typename lambda< typename F::arg1, false >::type, typename lambda< typename F::arg2, false >::type, typename lambda< typename F::arg3, false >::type
@@ -108,7 +108,7 @@ template<> struct lambda_impl<4, true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< bind4<
typedef mpl::protect< bind4<
f_
,typename lambda< typename F::arg1, false >::type, typename lambda< typename F::arg2, false >::type, typename lambda< typename F::arg3, false >::type, typename lambda< typename F::arg4, false >::type
@@ -134,7 +134,7 @@ template<> struct lambda_impl<5, true>
template< typename F > struct result_
{
typedef typename F::rebind f_;
typedef protect< bind5<
typedef mpl::protect< bind5<
f_
,typename lambda< typename F::arg1, false >::type, typename lambda< typename F::arg2, false >::type, typename lambda< typename F::arg3, false >::type, typename lambda< typename F::arg4, false >::type, typename lambda< typename F::arg5, false >::type

View File

@@ -29,7 +29,7 @@ template<
>
struct protect : T
{
typedef protect type;
typedef struct protect type;
};
#if defined(BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES)