From 997a78ad4f42341fd20fb8938c4060f813f5d25f Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 25 Aug 2005 16:27:28 +0000 Subject: [PATCH] Large patch from Ulrich Eckhardt to fix support for EVC++ 4. [SVN r30670] --- include/boost/mpl/apply_fwd.hpp | 2 +- include/boost/mpl/aux_/has_rebind.hpp | 4 ++-- include/boost/mpl/aux_/lambda_support.hpp | 2 +- include/boost/mpl/aux_/numeric_op.hpp | 2 +- include/boost/mpl/aux_/yes_no.hpp | 2 +- include/boost/mpl/is_sequence.hpp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/mpl/apply_fwd.hpp b/include/boost/mpl/apply_fwd.hpp index db05360..ab3773e 100644 --- a/include/boost/mpl/apply_fwd.hpp +++ b/include/boost/mpl/apply_fwd.hpp @@ -44,7 +44,7 @@ // agurt, 15/jan/02: top-level 'apply' template gives an ICE on MSVC // (for known reasons) -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # define BOOST_MPL_CFG_NO_APPLY_TEMPLATE #endif diff --git a/include/boost/mpl/aux_/has_rebind.hpp b/include/boost/mpl/aux_/has_rebind.hpp index de823ce..1643820 100644 --- a/include/boost/mpl/aux_/has_rebind.hpp +++ b/include/boost/mpl/aux_/has_rebind.hpp @@ -20,7 +20,7 @@ #if BOOST_WORKAROUND(__EDG_VERSION__, <= 244) && !defined(BOOST_INTEL_CXX_VERSION) # include -#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include # include # include @@ -43,7 +43,7 @@ namespace boost { namespace mpl { namespace aux { BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_rebind, rebind, false) -#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif BOOST_WORKAROUND(BOOST_MSVC, < 1300) BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_rebind_impl, rebind, false) diff --git a/include/boost/mpl/aux_/lambda_support.hpp b/include/boost/mpl/aux_/lambda_support.hpp index 5d67d2a..23b47cd 100644 --- a/include/boost/mpl/aux_/lambda_support.hpp +++ b/include/boost/mpl/aux_/lambda_support.hpp @@ -122,7 +122,7 @@ template< BOOST_MPL_PP_PARAMS(i,typename T) > \ , name< BOOST_MPL_PP_ENUM(i,::boost::mpl::na) >* \ ); \ /**/ -#elif !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif !BOOST_WORKAROUND(BOOST_MSVC, < 1300) # define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) \ template< BOOST_MPL_PP_PARAMS(i,typename T) > \ ::boost::mpl::aux::yes_tag operator|( \ diff --git a/include/boost/mpl/aux_/numeric_op.hpp b/include/boost/mpl/aux_/numeric_op.hpp index 093bb5f..ff76a09 100644 --- a/include/boost/mpl/aux_/numeric_op.hpp +++ b/include/boost/mpl/aux_/numeric_op.hpp @@ -145,7 +145,7 @@ template<> struct AUX778076_OP_IMPL_NAME #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && BOOST_WORKAROUND(BOOST_MSVC, != 1200) + && BOOST_WORKAROUND(BOOST_MSVC, >= 1300) template< typename T > struct AUX778076_OP_TAG_NAME : tag { diff --git a/include/boost/mpl/aux_/yes_no.hpp b/include/boost/mpl/aux_/yes_no.hpp index 7953464..ba6ff5b 100644 --- a/include/boost/mpl/aux_/yes_no.hpp +++ b/include/boost/mpl/aux_/yes_no.hpp @@ -38,7 +38,7 @@ template<> struct yes_no_tag template< BOOST_MPL_AUX_NTTP_DECL(long, n) > struct weighted_tag { -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef char (&type)[n]; #else char buf[n]; diff --git a/include/boost/mpl/is_sequence.hpp b/include/boost/mpl/is_sequence.hpp index e96b060..a22c9a2 100644 --- a/include/boost/mpl/is_sequence.hpp +++ b/include/boost/mpl/is_sequence.hpp @@ -29,7 +29,7 @@ #include #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include #elif BOOST_WORKAROUND(BOOST_MSVC, == 1300) # include @@ -63,7 +63,7 @@ template< > struct is_sequence : if_< -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) aux::msvc_is_class #else boost::is_class