diff --git a/include/boost/mpl/arg.hpp b/include/boost/mpl/arg.hpp index cc364a0..960f90a 100644 --- a/include/boost/mpl/arg.hpp +++ b/include/boost/mpl/arg.hpp @@ -19,8 +19,6 @@ // $Date$ // $Revision$ -#include - #if !defined(BOOST_MPL_PREPROCESSING_MODE) # include # include @@ -29,6 +27,7 @@ # include #endif +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ diff --git a/include/boost/mpl/aux_/arithmetic_op.hpp b/include/boost/mpl/aux_/arithmetic_op.hpp index 4814942..3da99bc 100644 --- a/include/boost/mpl/aux_/arithmetic_op.hpp +++ b/include/boost/mpl/aux_/arithmetic_op.hpp @@ -24,6 +24,7 @@ #endif #include +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ @@ -40,12 +41,12 @@ namespace boost { namespace mpl { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#if defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) namespace aux { template< typename T, T n1, T n2 > -struct BOOST_PP_CAT(BOOST_PP_CAT(msvc_,AUX778076_OP_PREFIX),_impl) +struct BOOST_PP_CAT(AUX778076_OP_PREFIX,_wknd) { - enum msvc_wknd { value = (n1 AUX778076_OP_TOKEN n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 AUX778076_OP_TOKEN n2)); typedef integral_c type; }; } @@ -55,18 +56,18 @@ template<> struct AUX778076_OP_IMPL_NAME { template< typename N1, typename N2 > struct apply -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) : integral_c< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - AUX778076_OP_TOKEN BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + AUX778076_OP_TOKEN BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > #else - : aux::BOOST_PP_CAT(BOOST_PP_CAT(msvc_,AUX778076_OP_PREFIX),_impl)< + : aux::BOOST_PP_CAT(AUX778076_OP_PREFIX,_wknd)< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/arity_spec.hpp b/include/boost/mpl/aux_/arity_spec.hpp index 65445ea..c10275e 100644 --- a/include/boost/mpl/aux_/arity_spec.hpp +++ b/include/boost/mpl/aux_/arity_spec.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) # define BOOST_MPL_AUX_NONTYPE_ARITY_SPEC(i,type,name) \ diff --git a/include/boost/mpl/aux_/comparison_op.hpp b/include/boost/mpl/aux_/comparison_op.hpp index f144f06..773a4ca 100644 --- a/include/boost/mpl/aux_/comparison_op.hpp +++ b/include/boost/mpl/aux_/comparison_op.hpp @@ -25,6 +25,7 @@ #define AUX778076_OP_ARITY 2 #include +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ @@ -35,7 +36,7 @@ #else -# include +# include # include namespace boost { namespace mpl { @@ -43,14 +44,12 @@ namespace boost { namespace mpl { // MSVC workaround: implement less in terms of greater #if 0 AUX778076_OP_TOKEN 1 && !(1 AUX778076_OP_TOKEN 0) && !(0 AUX778076_OP_TOKEN 0) # define AUX778076_OP(N1, N2) \ - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) \ - > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) \ - ) \ + ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) \ /**/ #else # define AUX778076_OP(N1, N2) \ - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) \ - AUX778076_OP_TOKEN BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) \ + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value \ + AUX778076_OP_TOKEN BOOST_MPL_AUX_VALUE_WKND(N2)::value \ ) \ /**/ #endif @@ -59,7 +58,7 @@ template<> struct AUX778076_OP_IMPL_NAME { template< typename N1, typename N2 > struct apply -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) : bool_< AUX778076_OP(N1, N2) > { #else diff --git a/include/boost/mpl/aux_/config/bcc_integral_constants.hpp b/include/boost/mpl/aux_/config/integral.hpp similarity index 53% rename from include/boost/mpl/aux_/config/bcc_integral_constants.hpp rename to include/boost/mpl/aux_/config/integral.hpp index 8e0cd36..bfaafca 100644 --- a/include/boost/mpl/aux_/config/bcc_integral_constants.hpp +++ b/include/boost/mpl/aux_/config/integral.hpp @@ -1,6 +1,6 @@ -#ifndef BOOST_MPL_AUX_CONFIG_BCC_INTEGRAL_CONSTANTS_HPP_INCLUDED -#define BOOST_MPL_AUX_CONFIG_BCC_INTEGRAL_CONSTANTS_HPP_INCLUDED +#ifndef BOOST_MPL_AUX_CONFIG_INTEGRAL_HPP_INCLUDED +#define BOOST_MPL_AUX_CONFIG_INTEGRAL_HPP_INCLUDED // Copyright Aleksey Gurtovoy 2004 // @@ -14,6 +14,7 @@ // $Date$ // $Revision$ +#include #include #if !defined(BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS) \ @@ -24,4 +25,14 @@ #endif -#endif // BOOST_MPL_AUX_CONFIG_BCC_INTEGRAL_CONSTANTS_HPP_INCLUDED +#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) \ + && !defined(BOOST_MPL_PREPROCESSING_MODE) \ + && ( BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \ + || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \ + ) + +# define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC + +#endif + +#endif // BOOST_MPL_AUX_CONFIG_INTEGRAL_HPP_INCLUDED diff --git a/include/boost/mpl/aux_/config/static_constant.hpp b/include/boost/mpl/aux_/config/static_constant.hpp index 7b2a369..43a7ffb 100644 --- a/include/boost/mpl/aux_/config/static_constant.hpp +++ b/include/boost/mpl/aux_/config/static_constant.hpp @@ -17,6 +17,9 @@ #if !defined(BOOST_MPL_PREPROCESSING_MODE) // BOOST_STATIC_CONSTANT is defined here: # include +#else +// undef the macro for the preprocessing mode +# undef BOOST_STATIC_CONSTANT #endif #endif // BOOST_MPL_AUX_CONFIG_STATIC_CONSTANT_HPP_INCLUDED diff --git a/include/boost/mpl/aux_/numeric_op.hpp b/include/boost/mpl/aux_/numeric_op.hpp index 428b81b..cc0e1a6 100644 --- a/include/boost/mpl/aux_/numeric_op.hpp +++ b/include/boost/mpl/aux_/numeric_op.hpp @@ -29,9 +29,10 @@ # include # include # include -# include #endif +#include + #if defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ || defined(BOOST_MPL_PREPROCESSING_MODE) diff --git a/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp b/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp index d346d4d..7a7ebf4 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -29,7 +29,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -46,7 +46,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -63,7 +63,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -80,7 +80,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -97,7 +97,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp b/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp index 4ab1cfa..c0f54be 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp b/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp index 24d7e78..2a52c9a 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp index 4957eae..cc1f09d 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp b/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp index cd88010..cae440d 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp index 054ba50..bb751bb 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp b/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp index db35cc9..ecaf59b 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp index 39463d5..57856cd 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/less.hpp b/include/boost/mpl/aux_/preprocessed/bcc/less.hpp index b18dca1..20d1f80 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp index 754bb81..5671937 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp b/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp index 4377853..478ea94 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp b/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp index 71c6c5b..feaeacd 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp index ec8b071..69a2d24 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp b/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp index 35bd23e..1987785 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp index 95347af..2cb5563 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp index 67bf8bc..4594a20 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc/times.hpp b/include/boost/mpl/aux_/preprocessed/bcc/times.hpp index 6fa5bdd..6dce942 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp index 4ab1cfa..c0f54be 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp index 24d7e78..2a52c9a 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp index 4957eae..cc1f09d 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp index cd88010..cae440d 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp index 054ba50..bb751bb 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp index db35cc9..ecaf59b 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp index 39463d5..57856cd 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp index b18dca1..20d1f80 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp index 754bb81..5671937 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp index 4377853..478ea94 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp index 71c6c5b..feaeacd 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp index ec8b071..69a2d24 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp index 35bd23e..1987785 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp index 95347af..2cb5563 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp index 67bf8bc..4594a20 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp b/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp index 6fa5bdd..6dce942 100644 --- a/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp b/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp b/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp index 4ab1cfa..c0f54be 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp b/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp index 24d7e78..2a52c9a 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp index 4957eae..cc1f09d 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp b/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp index cd88010..cae440d 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp index 054ba50..bb751bb 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp b/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp index db35cc9..ecaf59b 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp index 39463d5..57856cd 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/less.hpp b/include/boost/mpl/aux_/preprocessed/dmc/less.hpp index b18dca1..20d1f80 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp index 754bb81..5671937 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp b/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp index 4377853..478ea94 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp b/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp index 71c6c5b..feaeacd 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp index ec8b071..69a2d24 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp b/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp index 35bd23e..1987785 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp index 95347af..2cb5563 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp index 67bf8bc..4594a20 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/dmc/times.hpp b/include/boost/mpl/aux_/preprocessed/dmc/times.hpp index 6fa5bdd..6dce942 100644 --- a/include/boost/mpl/aux_/preprocessed/dmc/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/dmc/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp b/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp b/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp index 4ab1cfa..c0f54be 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp b/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp index 24d7e78..2a52c9a 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp index 4957eae..cc1f09d 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp b/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp index cd88010..cae440d 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp index 054ba50..bb751bb 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp b/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp index db35cc9..ecaf59b 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp index 39463d5..57856cd 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/less.hpp b/include/boost/mpl/aux_/preprocessed/gcc/less.hpp index b18dca1..20d1f80 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp index 754bb81..5671937 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp b/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp index 4377853..478ea94 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp b/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp index 71c6c5b..feaeacd 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp index ec8b071..69a2d24 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp b/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp index 35bd23e..1987785 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp index 95347af..2cb5563 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp index 67bf8bc..4594a20 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp b/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp index a3bf2db..fe4251b 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp @@ -21,11 +21,10 @@ template< > struct max_arity { - static int const value = - ( C6 > 0 ? C6 : ( C5 > 0 ? C5 : ( C4 > 0 ? C4 : ( C3 > 0 ? C3 : ( C2 - > 0 ? C2 : ( C1 > 0 ? C1 : -1 ) ) ) ) ) ) - ; + BOOST_STATIC_CONSTANT(int, value = + ( C6 > 0 ? C6 : ( C5 > 0 ? C5 : ( C4 > 0 ? C4 : ( C3 > 0 ? C3 : ( C2 > 0 ? C2 : ( C1 > 0 ? C1 : -1 ) ) ) ) ) ) + ); }; arity_tag<0>::type arity_helper(...); @@ -83,21 +82,18 @@ arity_helper(type_wrapper< F< T1,T2,T3,T4,T5,T6 > >, arity_tag<6>); template< typename F, int N > struct template_arity_impl { - static int const value = - sizeof(arity_helper(type_wrapper(), arity_tag())) - 1 - ; - + BOOST_STATIC_CONSTANT(int, value = + sizeof(arity_helper(type_wrapper(), arity_tag())) - 1 + ); }; template< typename F > struct template_arity { - static int const value = - ( max_arity< template_arity_impl< F,1 >::value, template_arity_impl< - F,2 >::value, template_arity_impl< F,3 >::value, template_arity_impl< - F,4 >::value, template_arity_impl< F,5 >::value, template_arity_impl< - F,6 >::value >::value ) - ; + BOOST_STATIC_CONSTANT(int, value = ( + max_arity< template_arity_impl< F,1 >::value, template_arity_impl< F,2 >::value, template_arity_impl< F,3 >::value, template_arity_impl< F,4 >::value, template_arity_impl< F,5 >::value, template_arity_impl< F,6 >::value >::value + + )); typedef int_ type; }; diff --git a/include/boost/mpl/aux_/preprocessed/gcc/times.hpp b/include/boost/mpl/aux_/preprocessed/gcc/times.hpp index 6fa5bdd..6dce942 100644 --- a/include/boost/mpl/aux_/preprocessed/gcc/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/gcc/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp index ccef909..4e89507 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp @@ -17,13 +17,13 @@ struct msvc_apply0 template< bool > struct f_ : F {}; template<> struct f_ { - template< typename P = int > struct apply + template< typename P = int > struct apply { typedef int type; }; }; - template< typename T = int > struct result_ + template< typename T = int > struct result_ : f_< aux::msvc_never_true::value > ::template apply<> { diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp index 6ee1241..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - enum { value = -1 }; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - enum { value = 1 }; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - enum { value = 2 }; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - enum { value = 3 }; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - enum { value = 4 }; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - enum { value = 5 }; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp index a7bf7ac..7116e3c 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp @@ -62,12 +62,12 @@ template< typename T > aux::no_tag is_bind_helper(protect*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -76,11 +76,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - }; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp index 0bad8ba..7912f43 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp @@ -88,12 +88,12 @@ template< typename T > aux::no_tag is_bind_helper(protect*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -102,11 +102,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - }; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp index bb4b5ee..3d796dc 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitand_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitand_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitand_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitand_impl +struct bitand_wknd { - enum msvc_wknd { value = (n1 & n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 & n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitand_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitand_impl< + : aux::bitand_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp index 6ad586b..d9ca86c 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitor_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitor_impl +struct bitor_wknd { - enum msvc_wknd { value = (n1 | n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 | n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitor_impl< + : aux::bitor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp index ba3ffba..99edaae 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitxor_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitxor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitxor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitxor_impl +struct bitxor_wknd { - enum msvc_wknd { value = (n1 ^ n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 ^ n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitxor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitxor_impl< + : aux::bitxor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp index 1e0ad81..d27ca4e 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct divides_impl : if_c< @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct divides_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct divides_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_divides_impl +struct divides_wknd { - enum msvc_wknd { value = (n1 / n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 / n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct divides_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_divides_impl< + : aux::divides_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp index 19d6bed..a961b02 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct equal_to_impl : if_c< @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp index 20ce579..10dd490 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct greater_impl : if_c< @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct greater_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp index e157687..054e574 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct greater_equal_impl : if_c< @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp index af64589..6a6895f 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct less_impl : if_c< @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct less_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > + BOOST_MPL_AUX_VALUE_WKND(N1)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp index 4c18dc8..8647ad8 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct less_equal_impl : if_c< @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp index 70e20fe..e5ea456 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_list_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct list_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value @@ -512,7 +512,7 @@ struct list_count_args + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp index c4f126d..ab25482 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_list_c_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_c_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct list_c_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value @@ -490,7 +490,7 @@ struct list_c_count_args + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp index 3fff829..970e0b7 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_map_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_map_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct map_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value @@ -512,7 +512,7 @@ struct map_count_args + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp index f4edfc9..c7632a0 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct minus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct minus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct minus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_minus_impl +struct minus_wknd { - enum msvc_wknd { value = (n1 - n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 - n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct minus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_minus_impl< + : aux::minus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp index 1394bc3..9887fc0 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct modulus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct modulus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct modulus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_modulus_impl +struct modulus_wknd { - enum msvc_wknd { value = (n1 % n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 % n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct modulus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_modulus_impl< + : aux::modulus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp index f7aba15..6cd651e 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct not_equal_to_impl : if_c< @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct not_equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct not_equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp index 34ba64d..826bb58 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct plus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct plus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct plus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_plus_impl +struct plus_wknd { - enum msvc_wknd { value = (n1 + n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 + n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct plus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_plus_impl< + : aux::plus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp index 483775d..95aaa5c 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_set_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_set_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct set_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value @@ -512,7 +512,7 @@ struct set_count_args + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp index 3933ac9..8e82e09 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct shift_left_impl : if_c< @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_left_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_left_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, typename Shift, T n, Shift s > -struct msvc_shift_left_impl +struct shift_left_wknd { - enum msvc_wknd { value = (n << s) }; + BOOST_STATIC_CONSTANT(T, value = (n << s)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct shift_left_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - : aux::msvc_shift_left_impl< + : aux::shift_left_wknd< typename N::value_type , typename S::value_type , N::value diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp index 87b4e7a..15f5d4e 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct shift_right_impl : if_c< @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_right_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_right_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, typename Shift, T n, Shift s > -struct msvc_shift_right_impl +struct shift_right_wknd { - enum msvc_wknd { value = (n >> s) }; + BOOST_STATIC_CONSTANT(T, value = (n >> s)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct shift_right_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - : aux::msvc_shift_right_impl< + : aux::shift_right_wknd< typename N::value_type , typename S::value_type , N::value diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp index 0b8daa4..cb1a12b 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct times_impl : if_c< @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct times_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct times_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_times_impl +struct times_wknd { - enum msvc_wknd { value = (n1 * n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 * n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct times_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_times_impl< + : aux::times_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp index c44f09c..a6c7b62 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_vector_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct vector_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value @@ -512,7 +512,7 @@ struct vector_count_args + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp b/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp index 5349187..6cf7b44 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_vector_c_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_c_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct vector_c_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value @@ -490,7 +490,7 @@ struct vector_c_count_args + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp index 6ee1241..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - enum { value = -1 }; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - enum { value = 1 }; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - enum { value = 2 }; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - enum { value = 3 }; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - enum { value = 4 }; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - enum { value = 5 }; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp index a7bf7ac..7116e3c 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp @@ -62,12 +62,12 @@ template< typename T > aux::no_tag is_bind_helper(protect*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -76,11 +76,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - }; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp index 0bad8ba..7912f43 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp @@ -88,12 +88,12 @@ template< typename T > aux::no_tag is_bind_helper(protect*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -102,11 +102,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - enum { value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - }; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp index acf3dbd..ec12aa9 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitand_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitand_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitand_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitand_impl +struct bitand_wknd { - enum msvc_wknd { value = (n1 & n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 & n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitand_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitand_impl< + : aux::bitand_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp index 452c5ad..2fcf4a3 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitor_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitor_impl +struct bitor_wknd { - enum msvc_wknd { value = (n1 | n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 | n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitor_impl< + : aux::bitor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp index c50bb9f..f6dd3b4 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct bitxor_impl : if_c< @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitxor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitxor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_bitxor_impl +struct bitxor_wknd { - enum msvc_wknd { value = (n1 ^ n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 ^ n2)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct bitxor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_bitxor_impl< + : aux::bitxor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp index 43fdcfa..f8dacaf 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct divides_impl : if_c< @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct divides_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct divides_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_divides_impl +struct divides_wknd { - enum msvc_wknd { value = (n1 / n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 / n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct divides_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_divides_impl< + : aux::divides_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp index 7950880..1be200e 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct equal_to_impl : if_c< @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp index 39ffd44..d73375f 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct greater_impl : if_c< @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct greater_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp index f2b6d19..5934365 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct greater_equal_impl : if_c< @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp index a2e5f3a..6580c02 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct less_impl : if_c< @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct less_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > + BOOST_MPL_AUX_VALUE_WKND(N1)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp index c2e65e7..f25fab8 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct less_equal_impl : if_c< @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp index 70e20fe..e5ea456 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_list_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct list_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value @@ -512,7 +512,7 @@ struct list_count_args + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp index c4f126d..ab25482 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_list_c_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_c_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct list_c_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value @@ -490,7 +490,7 @@ struct list_c_count_args + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp index 3fff829..970e0b7 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_map_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_map_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct map_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value @@ -512,7 +512,7 @@ struct map_count_args + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp index ac68272..84fc091 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct minus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct minus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct minus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_minus_impl +struct minus_wknd { - enum msvc_wknd { value = (n1 - n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 - n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct minus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_minus_impl< + : aux::minus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp index b5093c3..ab93867 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct modulus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct modulus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct modulus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_modulus_impl +struct modulus_wknd { - enum msvc_wknd { value = (n1 % n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 % n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct modulus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_modulus_impl< + : aux::modulus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp index 42808c3..e3423bb 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct not_equal_to_impl : if_c< @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct not_equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct not_equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -91,10 +91,10 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > template< typename N1, typename N2 > struct apply { - enum { value = - ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) - }; + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp index d1b442b..795c379 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct plus_impl : if_c< @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct plus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct plus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_plus_impl +struct plus_wknd { - enum msvc_wknd { value = (n1 + n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 + n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct plus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_plus_impl< + : aux::plus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp index 483775d..95aaa5c 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_set_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_set_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct set_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value @@ -512,7 +512,7 @@ struct set_count_args + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp index fa9ebcb..f69c6da 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct shift_left_impl : if_c< @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_left_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_left_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, typename Shift, T n, Shift s > -struct msvc_shift_left_impl +struct shift_left_wknd { - enum msvc_wknd { value = (n << s) }; + BOOST_STATIC_CONSTANT(T, value = (n << s)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct shift_left_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - : aux::msvc_shift_left_impl< + : aux::shift_left_wknd< typename N::value_type , typename S::value_type , N::value diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp index 39280e3..c63c697 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp @@ -16,8 +16,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct shift_right_impl : if_c< @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_right_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_right_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -88,9 +88,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, typename Shift, T n, Shift s > -struct msvc_shift_right_impl +struct shift_right_wknd { - enum msvc_wknd { value = (n >> s) }; + BOOST_STATIC_CONSTANT(T, value = (n >> s)); typedef integral_c< T,value > type; }; @@ -100,7 +100,7 @@ template<> struct shift_right_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - : aux::msvc_shift_right_impl< + : aux::shift_right_wknd< typename N::value_type , typename S::value_type , N::value diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp index 5efba8e..0885421 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp @@ -15,8 +15,8 @@ template< typename Tag1 , typename Tag2 - , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value - , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value + , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value > struct times_impl : if_c< @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct times_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct times_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - enum { value = 0 }; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,9 +87,9 @@ namespace boost { namespace mpl { namespace aux { template< typename T, T n1, T n2 > -struct msvc_times_impl +struct times_wknd { - enum msvc_wknd { value = (n1 * n2) }; + BOOST_STATIC_CONSTANT(T, value = (n1 * n2)); typedef integral_c< T,value > type; }; @@ -99,7 +99,7 @@ template<> struct times_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : aux::msvc_times_impl< + : aux::times_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp index c44f09c..a6c7b62 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_vector_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct vector_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value @@ -512,7 +512,7 @@ struct vector_count_args + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp b/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp index 5349187..6cf7b44 100644 --- a/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_vector_c_arg { - enum { value = true }; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_c_arg { - enum { value = false }; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct vector_c_count_args { - enum { value = + BOOST_STATIC_CONSTANT(int, value = is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value @@ -490,7 +490,7 @@ struct vector_c_count_args + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value - }; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp index 4ab1cfa..c0f54be 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp index 24d7e78..2a52c9a 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp index 4957eae..cc1f09d 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -136,8 +136,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp index cd88010..cae440d 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp index 054ba50..bb751bb 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp index db35cc9..ecaf59b 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp index 39463d5..57856cd 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp index b18dca1..20d1f80 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp index 754bb81..5671937 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp index 4377853..478ea94 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp index 71c6c5b..feaeacd 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp index ec8b071..69a2d24 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp index 35bd23e..1987785 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp index 95347af..2cb5563 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp index 67bf8bc..4594a20 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp b/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp index 6fa5bdd..6dce942 100644 --- a/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -135,8 +135,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp index 763e1d7..9838e79 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp @@ -233,13 +233,13 @@ namespace aux { template< typename T > struct is_apply_arg { - static bool const value = true; + static bool const value = true; }; template<> struct is_apply_arg { - static bool const value = false; + static bool const value = false; }; template< @@ -247,11 +247,7 @@ template< > struct apply_count_args { - static int const value = - is_apply_arg::value + is_apply_arg::value - + is_apply_arg::value + is_apply_arg::value - + is_apply_arg::value - ; + static int const value = is_apply_arg::value + is_apply_arg::value + is_apply_arg::value + is_apply_arg::value + is_apply_arg::value; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp index 5434dcf..16f365f 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp @@ -68,12 +68,12 @@ aux::yes_tag is_bind_helper(bind< F,T1,T2,T3,T4,T5 >*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -82,11 +82,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - static bool const value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - ; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; @@ -433,13 +432,13 @@ namespace aux { template< typename T > struct is_bind_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_bind_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -447,11 +446,11 @@ template< > struct bind_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_bind_arg::value + is_bind_arg::value + is_bind_arg::value + is_bind_arg::value + is_bind_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp index 9a47ab1..7c7ced9 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp @@ -94,12 +94,12 @@ aux::yes_tag is_bind_helper(bind< F,T1,T2,T3,T4,T5 >*); template< int N > aux::yes_tag is_bind_helper(arg*); -template< bool is_ref_ = true > +template< bool is_ref_ = true > struct is_bind_template_impl { template< typename T > struct result_ { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; }; @@ -108,11 +108,10 @@ struct is_bind_template_impl { template< typename T > struct result_ { - static bool const value = - sizeof(aux::is_bind_helper(static_cast(0))) == - sizeof(aux::yes_tag) - ; - + BOOST_STATIC_CONSTANT(bool, value = + sizeof(aux::is_bind_helper(static_cast(0))) + == sizeof(aux::yes_tag) + ); }; }; @@ -537,13 +536,13 @@ namespace aux { template< typename T > struct is_bind_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_bind_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -551,11 +550,11 @@ template< > struct bind_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_bind_arg::value + is_bind_arg::value + is_bind_arg::value + is_bind_arg::value + is_bind_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp index a0b7a01..664e6ab 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitand_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitand_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -90,8 +90,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp index 9a77014..af37761 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -90,8 +90,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp index 89204d4..d748327 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct bitxor_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct bitxor_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -90,8 +90,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp index 1a9baa5..ececd36 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct divides_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct divides_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp index fe9daa1..12fbbd4 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp index 1abf291..e2aabbf 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp index 8442d07..8cfd3fc 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct greater_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct greater_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp index 805edc9..7452e65 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp index 0f5078b..6652c56 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct less_equal_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct less_equal_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp index ed2e8bc..e5ea456 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_list_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct list_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value @@ -512,7 +512,7 @@ struct list_count_args + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value + is_list_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp index 3580528..ab25482 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_list_c_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_list_c_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct list_c_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value @@ -490,7 +490,7 @@ struct list_c_count_args + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value + is_list_c_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp index cf541ef..970e0b7 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_map_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_map_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct map_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value @@ -512,7 +512,7 @@ struct map_count_args + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value + is_map_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp index 20a5d8a..30d3843 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct minus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct minus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp index b2e9f01..36e93e4 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct modulus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct modulus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp index e98adfb..2cf9075 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct not_equal_to_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct not_equal_to_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,7 +85,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp index b3ec297..82b79cc 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct plus_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct plus_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp index bb3a76f..95aaa5c 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_set_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_set_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct set_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value @@ -512,7 +512,7 @@ struct set_count_args + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value + is_set_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp index 0351696..5ee32b3 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_left_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_left_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp index 620cc83..a86e021 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template<> struct shift_right_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template<> struct shift_right_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp index f852452..1e4cf15 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template<> struct times_impl< na,integral_c_tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template<> struct times_impl< integral_c_tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -89,8 +89,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp index 9c89828..a6c7b62 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp @@ -484,13 +484,13 @@ namespace aux { template< typename T > struct is_vector_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -501,7 +501,7 @@ template< > struct vector_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value @@ -512,7 +512,7 @@ struct vector_count_args + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value + is_vector_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp b/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp index e355f55..6cf7b44 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp @@ -463,13 +463,13 @@ namespace aux { template< long C > struct is_vector_c_arg { - static bool const value = true; + BOOST_STATIC_CONSTANT(bool, value = true); }; template<> struct is_vector_c_arg { - static bool const value = false; + BOOST_STATIC_CONSTANT(bool, value = false); }; template< @@ -479,7 +479,7 @@ template< > struct vector_c_count_args { - static int const value = + BOOST_STATIC_CONSTANT(int, value = is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value @@ -490,7 +490,7 @@ struct vector_c_count_args + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value + is_vector_c_arg::value - ; + ); }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp index 4ab1cfa..2a75a81 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -126,20 +126,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, bitand_) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct bitand_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 & n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct bitand_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::bitand_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp index 24d7e78..9be4282 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -126,20 +126,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, bitor_) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct bitor_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 | n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct bitor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::bitor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp index 4957eae..5da962f 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -126,20 +126,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, bitxor_) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct bitxor_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 ^ n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct bitxor_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::bitxor_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp index cd88010..70b88f8 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -125,20 +125,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, divides) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct divides_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 / n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct divides_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::divides_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp index 054ba50..ead0e6f 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp index db35cc9..a96cb31 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp index 39463d5..1cef73d 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp index b18dca1..d6ad529 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > + BOOST_MPL_AUX_VALUE_WKND(N1)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp index 754bb81..796f094 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp index 4377853..7a59db3 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -125,20 +125,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, minus) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct minus_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 - n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct minus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::minus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp index 71c6c5b..41d55c0 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -79,20 +79,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 2, modulus) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct modulus_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 % n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct modulus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::modulus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp index ec8b071..ebca270 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,12 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > { + BOOST_STATIC_CONSTANT(bool, value = + ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) + ); + typedef bool_ type; }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp index 35bd23e..07165f6 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -125,20 +125,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, plus) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct plus_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 + n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct plus_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::plus_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp index 95347af..be4f337 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -80,17 +80,28 @@ BOOST_MPL_AUX_NA_SPEC2(2, 2, shift_left) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, typename Shift, T n, Shift s > +struct shift_left_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n << s)); + typedef integral_c< T,value > type; +}; + +} + template<> struct shift_left_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - - : integral_c< + : aux::shift_left_wknd< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) - ) - > + , typename S::value_type + , N::value + , S::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp index 67bf8bc..007e0d4 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -80,17 +80,28 @@ BOOST_MPL_AUX_NA_SPEC2(2, 2, shift_right) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, typename Shift, T n, Shift s > +struct shift_right_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n >> s)); + typedef integral_c< T,value > type; +}; + +} + template<> struct shift_right_impl< integral_c_tag,integral_c_tag > { template< typename N, typename S > struct apply - - : integral_c< + : aux::shift_right_wknd< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) - ) - > + , typename S::value_type + , N::value + , S::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp b/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp index 6fa5bdd..21cdd77 100644 --- a/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -125,20 +125,30 @@ BOOST_MPL_AUX_NA_SPEC2(2, 5, times) }} namespace boost { namespace mpl { + +namespace aux { +template< typename T, T n1, T n2 > +struct times_wknd +{ + BOOST_STATIC_CONSTANT(T, value = (n1 * n2)); + typedef integral_c< T,value > type; +}; + +} + template<> struct times_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - - : integral_c< + : aux::times_wknd< typename aux::largest_int< typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) - ) - > + , N1::value + , N2::value + >::type + { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/arg.hpp b/include/boost/mpl/aux_/preprocessed/plain/arg.hpp index 4e404a6..6eaf95d 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/arg.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/arg.hpp @@ -13,7 +13,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN template<> struct arg< -1 > { - static int const value = -1; + BOOST_STATIC_CONSTANT(int, value = -1); BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -30,7 +30,7 @@ template<> struct arg< -1 > template<> struct arg<1> { - static int const value = 1; + BOOST_STATIC_CONSTANT(int, value = 1); typedef arg<2> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -48,7 +48,7 @@ template<> struct arg<1> template<> struct arg<2> { - static int const value = 2; + BOOST_STATIC_CONSTANT(int, value = 2); typedef arg<3> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -66,7 +66,7 @@ template<> struct arg<2> template<> struct arg<3> { - static int const value = 3; + BOOST_STATIC_CONSTANT(int, value = 3); typedef arg<4> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -84,7 +84,7 @@ template<> struct arg<3> template<> struct arg<4> { - static int const value = 4; + BOOST_STATIC_CONSTANT(int, value = 4); typedef arg<5> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) @@ -102,7 +102,7 @@ template<> struct arg<4> template<> struct arg<5> { - static int const value = 5; + BOOST_STATIC_CONSTANT(int, value = 5); typedef arg<6> next; BOOST_MPL_AUX_ARG_TYPEDEF(na, tag) BOOST_MPL_AUX_ARG_TYPEDEF(na, type) diff --git a/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp b/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp index 53edc22..5595249 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp @@ -34,7 +34,7 @@ template<> struct bitand_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitand_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitand_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -131,8 +131,8 @@ struct bitand_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - & BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + & BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp b/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp index c3abd9e..b917755 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp @@ -34,7 +34,7 @@ template<> struct bitor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -131,8 +131,8 @@ struct bitor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - | BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + | BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp b/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp index d18b198..589dd62 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp @@ -34,7 +34,7 @@ template<> struct bitxor_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct bitxor_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct bitxor_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -131,8 +131,8 @@ struct bitxor_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - ^ BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + ^ BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/divides.hpp b/include/boost/mpl/aux_/preprocessed/plain/divides.hpp index 85f67b0..2710ab8 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/divides.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/divides.hpp @@ -33,7 +33,7 @@ template<> struct divides_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct divides_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct divides_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -130,8 +130,8 @@ struct divides_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - / BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + / BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp b/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp index 21da51f..e3d690f 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp @@ -33,7 +33,7 @@ template<> struct equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) == BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value == BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/greater.hpp b/include/boost/mpl/aux_/preprocessed/plain/greater.hpp index 69e7574..53bd524 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/greater.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/greater.hpp @@ -33,7 +33,7 @@ template<> struct greater_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct greater_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value > BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp b/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp index d29eef9..408e8a9 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp @@ -33,7 +33,7 @@ template<> struct greater_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct greater_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct greater_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct greater_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) >= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/less.hpp b/include/boost/mpl/aux_/preprocessed/plain/less.hpp index 55fdbd5..985c32d 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/less.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/less.hpp @@ -33,7 +33,7 @@ template<> struct less_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct less_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) > BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N2)::value > BOOST_MPL_AUX_VALUE_WKND(N1)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp b/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp index a7c5c68..6d4822e 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp @@ -33,7 +33,7 @@ template<> struct less_equal_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct less_equal_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct less_equal_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct less_equal_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) <= BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <= BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/minus.hpp b/include/boost/mpl/aux_/preprocessed/plain/minus.hpp index d2b9478..cf11e5d 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/minus.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/minus.hpp @@ -33,7 +33,7 @@ template<> struct minus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct minus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct minus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -130,8 +130,8 @@ struct minus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - - BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + - BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp b/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp index f42e68a..ba9a481 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp @@ -33,7 +33,7 @@ template<> struct modulus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct modulus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct modulus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -87,8 +87,8 @@ struct modulus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - % BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + % BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp b/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp index d0358af..dd2ff97 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp @@ -33,7 +33,7 @@ template<> struct not_equal_to_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct not_equal_to_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct not_equal_to_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -83,7 +83,7 @@ struct not_equal_to_impl< integral_c_tag,integral_c_tag > { template< typename N1, typename N2 > struct apply - : bool_< ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) != BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) ) > + : bool_< ( BOOST_MPL_AUX_VALUE_WKND(N1)::value != BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { }; }; diff --git a/include/boost/mpl/aux_/preprocessed/plain/plus.hpp b/include/boost/mpl/aux_/preprocessed/plain/plus.hpp index ecb9183..4155844 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/plus.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/plus.hpp @@ -33,7 +33,7 @@ template<> struct plus_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct plus_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct plus_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -130,8 +130,8 @@ struct plus_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - + BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + + BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp b/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp index 241bbc3..81b71be 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp @@ -34,7 +34,7 @@ template<> struct shift_left_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_left_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_left_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,8 @@ struct shift_left_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - << BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + << BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp b/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp index 2ac0f6f..43f5b18 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp @@ -34,7 +34,7 @@ template<> struct shift_right_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -43,7 +43,7 @@ template< typename Tag > struct shift_right_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -52,7 +52,7 @@ template< typename Tag > struct shift_right_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -85,8 +85,8 @@ struct shift_right_impl< integral_c_tag,integral_c_tag > : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - >> BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + >> BOOST_MPL_AUX_VALUE_WKND(S)::value ) > { diff --git a/include/boost/mpl/aux_/preprocessed/plain/times.hpp b/include/boost/mpl/aux_/preprocessed/plain/times.hpp index a84f0ff..f235bc6 100644 --- a/include/boost/mpl/aux_/preprocessed/plain/times.hpp +++ b/include/boost/mpl/aux_/preprocessed/plain/times.hpp @@ -33,7 +33,7 @@ template<> struct times_impl< na,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -42,7 +42,7 @@ template< typename Tag > struct times_impl< na,Tag > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -51,7 +51,7 @@ template< typename Tag > struct times_impl< Tag,na > template< typename U1, typename U2 > struct apply { typedef apply type; - static int const value = 0; + BOOST_STATIC_CONSTANT(int, value = 0); }; }; @@ -130,8 +130,8 @@ struct times_impl< integral_c_tag,integral_c_tag > typename N1::value_type , typename N2::value_type >::type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N1::value_type, N1) - * BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N2::value_type, N2) + , ( BOOST_MPL_AUX_VALUE_WKND(N1)::value + * BOOST_MPL_AUX_VALUE_WKND(N2)::value ) > { diff --git a/include/boost/mpl/aux_/sequence_wrapper.hpp b/include/boost/mpl/aux_/sequence_wrapper.hpp index 6b6383b..f1b4b5c 100644 --- a/include/boost/mpl/aux_/sequence_wrapper.hpp +++ b/include/boost/mpl/aux_/sequence_wrapper.hpp @@ -18,6 +18,7 @@ // $Revision$ # include +# include # include # include diff --git a/include/boost/mpl/aux_/shift_op.hpp b/include/boost/mpl/aux_/shift_op.hpp index bcc50ec..57bf21c 100644 --- a/include/boost/mpl/aux_/shift_op.hpp +++ b/include/boost/mpl/aux_/shift_op.hpp @@ -1,5 +1,5 @@ -// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION // Copyright Aleksey Gurtovoy 2000-2004 // @@ -25,6 +25,7 @@ #define AUX778076_OP_ARITY 2 #include +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ @@ -35,18 +36,17 @@ #else -# include +# include # include - namespace boost { namespace mpl { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#if defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) namespace aux { template< typename T, typename Shift, T n, Shift s > -struct BOOST_PP_CAT(BOOST_PP_CAT(msvc_,AUX778076_OP_PREFIX),_impl) +struct BOOST_PP_CAT(AUX778076_OP_PREFIX,_wknd) { - enum msvc_wknd { value = (n AUX778076_OP_TOKEN s) }; + BOOST_STATIC_CONSTANT(T, value = (n AUX778076_OP_TOKEN s)); typedef integral_c type; }; } @@ -56,15 +56,15 @@ template<> struct AUX778076_OP_IMPL_NAME { template< typename N, typename S > struct apply -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC) : integral_c< typename N::value_type - , ( BOOST_MPL_AUX_NESTED_VALUE_WKND(typename N::value_type, N) - AUX778076_OP_TOKEN BOOST_MPL_AUX_NESTED_VALUE_WKND(typename S::value_type, S) + , ( BOOST_MPL_AUX_VALUE_WKND(N)::value + AUX778076_OP_TOKEN BOOST_MPL_AUX_VALUE_WKND(S)::value ) > #else - : aux::BOOST_PP_CAT(BOOST_PP_CAT(msvc_,AUX778076_OP_NAME),_impl)< + : aux::BOOST_PP_CAT(AUX778076_OP_PREFIX,_wknd)< typename N::value_type , typename S::value_type , N::value diff --git a/include/boost/mpl/aux_/template_arity.hpp b/include/boost/mpl/aux_/template_arity.hpp index d95b5cf..8a979dc 100644 --- a/include/boost/mpl/aux_/template_arity.hpp +++ b/include/boost/mpl/aux_/template_arity.hpp @@ -33,6 +33,7 @@ # endif #endif +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ diff --git a/include/boost/mpl/aux_/value_wknd.hpp b/include/boost/mpl/aux_/value_wknd.hpp index a8d1809..f2030c4 100644 --- a/include/boost/mpl/aux_/value_wknd.hpp +++ b/include/boost/mpl/aux_/value_wknd.hpp @@ -15,7 +15,7 @@ // $Revision$ #include -#include +#include #include #include diff --git a/include/boost/mpl/bind.hpp b/include/boost/mpl/bind.hpp index 90886cc..fa40645 100644 --- a/include/boost/mpl/bind.hpp +++ b/include/boost/mpl/bind.hpp @@ -30,13 +30,13 @@ # include # include # include -# include # if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) # include # endif #endif #include +#include #include #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ diff --git a/include/boost/mpl/if.hpp b/include/boost/mpl/if.hpp index 6533a1c..9b4f999 100644 --- a/include/boost/mpl/if.hpp +++ b/include/boost/mpl/if.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/boost/mpl/integral_c.hpp b/include/boost/mpl/integral_c.hpp index 7c7252c..6857a7f 100644 --- a/include/boost/mpl/integral_c.hpp +++ b/include/boost/mpl/integral_c.hpp @@ -16,6 +16,7 @@ #include #include +#include #include #if BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(53800)) diff --git a/include/boost/mpl/is_placeholder.hpp b/include/boost/mpl/is_placeholder.hpp index 213de70..a5b11ca 100644 --- a/include/boost/mpl/is_placeholder.hpp +++ b/include/boost/mpl/is_placeholder.hpp @@ -18,8 +18,9 @@ #include #include #include -#include #include +#include +#include namespace boost { namespace mpl { diff --git a/include/boost/mpl/map/aux_/at_impl.hpp b/include/boost/mpl/map/aux_/at_impl.hpp index b302969..12ec42f 100644 --- a/include/boost/mpl/map/aux_/at_impl.hpp +++ b/include/boost/mpl/map/aux_/at_impl.hpp @@ -29,6 +29,7 @@ # include # include # include +# include #endif namespace boost { namespace mpl { diff --git a/include/boost/mpl/set/aux_/has_key_impl.hpp b/include/boost/mpl/set/aux_/has_key_impl.hpp index 1746ce6..5b15b06 100644 --- a/include/boost/mpl/set/aux_/has_key_impl.hpp +++ b/include/boost/mpl/set/aux_/has_key_impl.hpp @@ -24,6 +24,7 @@ #include #include #include +#include namespace boost { namespace mpl { diff --git a/preprocessed/include/msvc60/user.hpp b/preprocessed/include/msvc60/user.hpp index fffda44..20eef26 100644 --- a/preprocessed/include/msvc60/user.hpp +++ b/preprocessed/include/msvc60/user.hpp @@ -10,3 +10,4 @@ #define BOOST_MPL_CFG_NO_APPLY_TEMPLATE #define BOOST_MPL_CFG_MSVC_60_ETI_BUG #define BOOST_MPL_CFG_MSVC_ETI_BUG +#define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC diff --git a/preprocessed/include/msvc70/user.hpp b/preprocessed/include/msvc70/user.hpp index c939784..62aed8f 100644 --- a/preprocessed/include/msvc70/user.hpp +++ b/preprocessed/include/msvc70/user.hpp @@ -5,3 +5,4 @@ #define BOOST_MPL_CFG_NO_BIND_TEMPLATE #define BOOST_MPL_CFG_NO_APPLY_TEMPLATE #define BOOST_MPL_CFG_MSVC_ETI_BUG +#define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC diff --git a/preprocessed/include/no_ttp/user.hpp b/preprocessed/include/no_ttp/user.hpp index 5b50b9a..f7ff291 100644 --- a/preprocessed/include/no_ttp/user.hpp +++ b/preprocessed/include/no_ttp/user.hpp @@ -1,2 +1,3 @@ #define BOOST_NO_CONFIG #define BOOST_NO_TEMPLATE_TEMPLATES +#define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC diff --git a/preprocessed/pp.py b/preprocessed/pp.py index c05c0a7..ebd7b41 100644 --- a/preprocessed/pp.py +++ b/preprocessed/pp.py @@ -159,7 +159,7 @@ class pretty: self.re_empty_line = re.compile(r'^\s*$') self.re_comma = re.compile(r'(\S+)\s*,\s*') - self.re_assign = re.compile(r'([^<|^!|^>])\s*(=+)\s*') + self.re_assign = re.compile(r'(\S+[^<|^!|^>])\s*(=+)\s*(\S+)') self.re_marked_empty_comment = re.compile(r'^\s*//\s*$') self.re_typedef = re.compile(r'^\s+typedef\s+.*?;$') self.re_nsl = re.compile(r'^(\s+typedef\s+.*?;|\s*(private|public):\s*|\s*{\s*|\s*(\w|\d|,)+\s*)$') @@ -172,7 +172,7 @@ class pretty: ) self.re_simple_list = re.compile(r'(\w+)\s*<((\w|,| |-)+)>') - self.re_static_const = re.compile(r'(\s*)((static\s+.*?|enum\s*\w*\s*{\s*)value\s*=)(.*?)(}?;)$') + self.re_static_const = re.compile(r'(\s*)((BOOST_STATIC_CONSTANT\(\s*\w+,\s*|enum\s*\w*\s*{\s*)value\s*=)(.*?)([}|\)];)$') self.re_typedefs = re.compile(r'(\s*)((\s*typedef\s*.*?;)+)\s*$') self.re_fix_angle_brackets = re.compile( r'(>(\s*>)+)(,|\n$)' ) self.re_closing_curly_brace = re.compile(r'^(}|struct\s+\w+);\s*$') @@ -232,9 +232,8 @@ class pretty: return # formatting - line = self.re_comma.sub( r'\1, ', line ) - line = self.re_assign.sub( r'\1 \2 ', line ) + line = self.re_assign.sub( r'\1 \2 \3', line ) line = self.re_marked_empty_comment.sub( r'\n', line ) line = self.re_type_const.sub( r'\2 \1', line ) line = self.re_templ_args.sub( handle_args, line )