From 67f5d7399972cb13dea8b91f1942dc07c922fc79 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 25 Sep 2013 08:26:46 +0000 Subject: [PATCH] MPL: Remove use of obsolete BOOST_MPL_CFG_NO_APPLY_TEMPLATE It was only defined for MSVC versions which are no longer supported. [SVN r85887] --- include/boost/mpl/apply.hpp | 6 ------ include/boost/mpl/apply_fwd.hpp | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/include/boost/mpl/apply.hpp b/include/boost/mpl/apply.hpp index 581eb68..0a2c95f 100644 --- a/include/boost/mpl/apply.hpp +++ b/include/boost/mpl/apply.hpp @@ -95,7 +95,6 @@ namespace boost { namespace mpl { (3,(0, BOOST_MPL_LIMIT_METAFUNCTION_ARITY, )) #include BOOST_PP_ITERATE() -# if !defined(BOOST_MPL_CFG_NO_APPLY_TEMPLATE) // real C++ version is already taken care of # if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) @@ -119,7 +118,6 @@ struct apply }; # endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# endif // BOOST_MPL_CFG_NO_APPLY_TEMPLATE # undef AUX778076_APPLY_N_SPEC_PARAMS # undef AUX778076_APPLY_N_PARTIAL_SPEC_PARAMS @@ -176,7 +174,6 @@ struct BOOST_PP_CAT(apply,i_) }; #endif -# if !defined(BOOST_MPL_CFG_NO_APPLY_TEMPLATE) # if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) #if i_ == BOOST_MPL_LIMIT_METAFUNCTION_ARITY @@ -200,7 +197,6 @@ struct apply< F AUX778076_APPLY_N_PARTIAL_SPEC_PARAMS(i_, T, na) > # else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -#if !defined(BOOST_MPL_CFG_NO_APPLY_TEMPLATE) namespace aux { template<> @@ -218,10 +214,8 @@ struct apply_chooser }; } // namespace aux -#endif # endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# endif // BOOST_MPL_CFG_NO_APPLY_TEMPLATE # undef i_ diff --git a/include/boost/mpl/apply_fwd.hpp b/include/boost/mpl/apply_fwd.hpp index 5f5fa78..4393870 100644 --- a/include/boost/mpl/apply_fwd.hpp +++ b/include/boost/mpl/apply_fwd.hpp @@ -42,12 +42,6 @@ # include # include -// agurt, 15/jan/02: top-level 'apply' template gives an ICE on MSVC -// (for known reasons) -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -# define BOOST_MPL_CFG_NO_APPLY_TEMPLATE -#endif - namespace boost { namespace mpl { // local macro, #undef-ined at the end of the header @@ -64,8 +58,6 @@ namespace boost { namespace mpl { BOOST_MPL_PP_PARAMS(n, param) \ /**/ -# if !defined(BOOST_MPL_CFG_NO_APPLY_TEMPLATE) - #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) // forward declaration template< @@ -78,8 +70,6 @@ template< BOOST_AUX_NTTP_DECL(int, arity_) > struct apply_chooser; } #endif -# endif // BOOST_MPL_CFG_NO_APPLY_TEMPLATE - #define BOOST_PP_ITERATION_PARAMS_1 \ (3,(0, BOOST_MPL_LIMIT_METAFUNCTION_ARITY, )) #include BOOST_PP_ITERATE()