From 3394c6c03d6a79bc06a60df56ebf4652332eada4 Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Tue, 7 Sep 2004 12:24:50 +0000 Subject: [PATCH] more MIPSpro 7.3 fixes [SVN r24957] --- include/boost/mpl/aux_/lambda_no_ctps.hpp | 2 +- .../boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp | 10 +++++----- .../boost/mpl/aux_/preprocessed/bcc/template_arity.hpp | 2 +- .../mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/bcc551/template_arity.hpp | 2 +- .../boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp | 10 +++++----- .../boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp | 10 +++++----- .../boost/mpl/aux_/preprocessed/gcc/template_arity.hpp | 2 +- .../mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/msvc60/template_arity.hpp | 4 ++-- .../mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/msvc70/template_arity.hpp | 4 ++-- .../mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/no_ctps/template_arity.hpp | 2 +- .../mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp | 10 +++++----- .../mpl/aux_/preprocessed/no_ttp/template_arity.hpp | 2 +- .../mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp | 10 +++++----- include/boost/mpl/aux_/template_arity.hpp | 6 +++--- 19 files changed, 63 insertions(+), 63 deletions(-) diff --git a/include/boost/mpl/aux_/lambda_no_ctps.hpp b/include/boost/mpl/aux_/lambda_no_ctps.hpp index d6fa60c..05cba60 100644 --- a/include/boost/mpl/aux_/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/lambda_no_ctps.hpp @@ -175,7 +175,7 @@ template<> struct lambda_impl< int_ > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp index 3303b57..1164f0f 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp index 3303b57..1164f0f 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp index fe4251b..3e7bfba 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp @@ -95,7 +95,7 @@ struct template_arity )); - typedef int_ type; + typedef mpl::int_ type; }; }}} diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp index 8176698..1668771 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; @@ -38,7 +38,7 @@ struct template_arity template<> struct template_arity - : int_< -1 > + : mpl::int_< -1 > { }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp index 8176698..1668771 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; @@ -38,7 +38,7 @@ struct template_arity template<> struct template_arity - : int_< -1 > + : mpl::int_< -1 > { }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp index 3303b57..1164f0f 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp index 76d3f3f..890a198 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp index 3303b57..1164f0f 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp @@ -15,7 +15,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_< -1 > + : mpl::int_< -1 > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp b/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp index ab89996..f8f109c 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp @@ -54,7 +54,7 @@ template<> struct lambda_impl< int_<1> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -84,7 +84,7 @@ template<> struct lambda_impl< int_<2> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -116,7 +116,7 @@ template<> struct lambda_impl< int_<3> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -151,7 +151,7 @@ template<> struct lambda_impl< int_<4> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; @@ -188,7 +188,7 @@ template<> struct lambda_impl< int_<5> > typedef typename if_< is_le - , if_< Protect, protect, bind_ > + , if_< Protect, mpl::protect, bind_ > , identity >::type type_; diff --git a/include/boost/mpl/aux_/template_arity.hpp b/include/boost/mpl/aux_/template_arity.hpp index 8a979dc..f66ebed 100644 --- a/include/boost/mpl/aux_/template_arity.hpp +++ b/include/boost/mpl/aux_/template_arity.hpp @@ -117,7 +117,7 @@ struct template_arity ) >::value )); - typedef int_ type; + typedef mpl::int_ type; }; # undef AUX778076_TEMPLATE_ARITY_IMPL_INVOCATION @@ -137,7 +137,7 @@ template< bool > struct template_arity_impl { template< typename F > struct result_ - : int_<-1> + : mpl::int_<-1> { }; }; @@ -161,7 +161,7 @@ struct template_arity #if defined(BOOST_MPL_CFG_MSVC_ETI_BUG) template<> struct template_arity - : int_<-1> + : mpl::int_<-1> { }; #endif