Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85944 - trunk/boost/mpl/aux_
From: steveire_at_[hidden]
Date: 2013-09-26 05:45:59


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

Log:
MPL: Remove obsolete MSVC version checks.

Text files modified:
   trunk/boost/mpl/aux_/numeric_op.hpp | 19 +------------------
   1 files changed, 1 insertions(+), 18 deletions(-)

Modified: trunk/boost/mpl/aux_/numeric_op.hpp
==============================================================================
--- trunk/boost/mpl/aux_/numeric_op.hpp Thu Sep 26 05:45:41 2013 (r85943)
+++ trunk/boost/mpl/aux_/numeric_op.hpp 2013-09-26 05:45:59 EDT (Thu, 26 Sep 2013) (r85944)
@@ -26,7 +26,6 @@
 # include <boost/mpl/aux_/na.hpp>
 # include <boost/mpl/aux_/na_spec.hpp>
 # include <boost/mpl/aux_/lambda_support.hpp>
-# include <boost/mpl/aux_/msvc_eti_base.hpp>
 # include <boost/mpl/aux_/value_wknd.hpp>
 # include <boost/mpl/aux_/config/eti.hpp>
 # include <boost/mpl/aux_/nttp_decl.hpp>
@@ -74,21 +73,12 @@
 template<
       typename Tag1
     , typename Tag2
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- , 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 AUX778076_OP_IMPL_NAME
- : if_c<
- ( tag1_ > tag2_ )
-#else
>
 struct AUX778076_OP_IMPL_NAME
     : if_c<
           ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
> BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
             )
-#endif
         , aux::cast2nd_impl< AUX778076_OP_IMPL_NAME<Tag1,Tag1>,Tag1,Tag2 >
         , aux::cast1st_impl< AUX778076_OP_IMPL_NAME<Tag2,Tag2>,Tag1,Tag2 >
>::type
@@ -145,7 +135,7 @@
 
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
- && BOOST_WORKAROUND(BOOST_MSVC, >= 1300)
+ && defined(BOOST_MSVC)
 template< typename T > struct AUX778076_OP_TAG_NAME
     : tag<T,na>
 {
@@ -205,11 +195,7 @@
     BOOST_MPL_PP_DEF_PARAMS_TAIL(2, typename N, na)
>
 struct AUX778076_OP_NAME
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
- : aux::msvc_eti_base< typename if_<
-#else
     : if_<
-#endif
           is_na<N3>
         , BOOST_PP_CAT(AUX778076_OP_NAME,2)<N1,N2>
         , AUX778076_OP_NAME<
@@ -217,9 +203,6 @@
             , BOOST_MPL_PP_EXT_PARAMS(3, BOOST_PP_INC(AUX778076_OP_ARITY), N)
>
>::type
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
- >
-#endif
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(
           AUX778076_OP_ARITY


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk