[Boost-commit] svn:boost r85947 - trunk/boost/mpl

Subject: [Boost-commit] svn:boost r85947 - trunk/boost/mpl
From: steveire_at_[hidden]
Date: 2013-09-26 05:47:19

Author: skelly
Date: 2013-09-26 05:47:19 EDT (Thu, 26 Sep 2013)
New Revision: 85947
URL: http://svn.boost.org/trac/boost/changeset/85947

Log:
MPL: Remove apply-wrap workaround for no-longer-supported MSVC

Text files modified: 
   trunk/boost/mpl/apply.hpp      |     8 --------                                
   trunk/boost/mpl/apply_wrap.hpp |    29 +----------------------------           
   2 files changed, 1 insertions(+), 36 deletions(-)

Modified: trunk/boost/mpl/apply.hpp
==============================================================================
--- trunk/boost/mpl/apply.hpp	Thu Sep 26 05:47:03 2013	(r85946)
+++ trunk/boost/mpl/apply.hpp	2013-09-26 05:47:19 EDT (Thu, 26 Sep 2013)	(r85947)
@@ -143,19 +143,11 @@
       typename F AUX778076_APPLY_N_COMMA_PARAMS(i_, typename T)
     >
 struct BOOST_PP_CAT(apply,i_)
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
     : BOOST_PP_CAT(apply_wrap,i_)< 
           typename lambda<F>::type
         AUX778076_APPLY_N_COMMA_PARAMS(i_, T)
         >
 {
-#else
-{
-    typedef typename BOOST_PP_CAT(apply_wrap,i_)< 
-          typename lambda<F>::type
-        AUX778076_APPLY_N_COMMA_PARAMS(i_, T)
-        >::type type;
-#endif
     BOOST_MPL_AUX_LAMBDA_SUPPORT(
           BOOST_PP_INC(i_)
         , BOOST_PP_CAT(apply,i_)

Modified: trunk/boost/mpl/apply_wrap.hpp
==============================================================================
--- trunk/boost/mpl/apply_wrap.hpp	Thu Sep 26 05:47:03 2013	(r85946)
+++ trunk/boost/mpl/apply_wrap.hpp	2013-09-26 05:47:19 EDT (Thu, 26 Sep 2013)	(r85947)
@@ -85,26 +85,7 @@
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
-#   if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-// MSVC version
-
-#define AUX778076_MSVC_DTW_NAME BOOST_PP_CAT(msvc_apply,i_)
-#define AUX778076_MSVC_DTW_ORIGINAL_NAME apply
-#define AUX778076_MSVC_DTW_ARITY i_
-#include <boost/mpl/aux_/msvc_dtw.hpp>
-
-template<
-      typename F BOOST_PP_COMMA_IF(i_) AUX778076_APPLY_WRAP_PARAMS(i_, typename T)
-    >
-struct BOOST_PP_CAT(apply_wrap,i_)
-{
-    // Metafunction forwarding confuses vc6
-    typedef typename BOOST_PP_CAT(msvc_apply,i_)<F>::template result_<
-          AUX778076_APPLY_WRAP_PARAMS(i_, T)
-        >::type type;
-};
-
-#   elif defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
+#   if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 // MWCW/Borland version
 
 template<
@@ -138,16 +119,8 @@
 #endif
     >
 struct BOOST_PP_CAT(apply_wrap,i_)
-// metafunction forwarding confuses MSVC 7.0
-#if !BOOST_WORKAROUND(BOOST_MSVC, == 1300)
     : F::template apply< AUX778076_APPLY_WRAP_PARAMS(i_, T) >
 {
-#else
-{    
-    typedef typename F::template apply<
-         AUX778076_APPLY_WRAP_PARAMS(i_, T)
-        >::type type;
-#endif
 };
 
 #if i_ == 0 && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)