From eccea8a32452c3cb9f29fa7920bf61b04a7d7bfc Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 12 Oct 2013 10:19:11 +0000 Subject: [PATCH] MPL: Remove obsolete GCC version checks. [SVN r86260] --- include/boost/mpl/aux_/config/operators.hpp | 1 - include/boost/mpl/aux_/config/typeof.hpp | 2 +- include/boost/mpl/eval_if.hpp | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/boost/mpl/aux_/config/operators.hpp b/include/boost/mpl/aux_/config/operators.hpp index 704cade..ac4808b 100644 --- a/include/boost/mpl/aux_/config/operators.hpp +++ b/include/boost/mpl/aux_/config/operators.hpp @@ -21,7 +21,6 @@ #if !defined(BOOST_MPL_CFG_USE_OPERATORS_OVERLOADING) \ && ( BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(__EDG_VERSION__, <= 245) \ - || BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \ || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \ ) diff --git a/include/boost/mpl/aux_/config/typeof.hpp b/include/boost/mpl/aux_/config/typeof.hpp index cde6179..2ac5e76 100644 --- a/include/boost/mpl/aux_/config/typeof.hpp +++ b/include/boost/mpl/aux_/config/typeof.hpp @@ -18,7 +18,7 @@ #if !defined(BOOST_MPL_CFG_HAS_TYPEOF) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && ( defined(BOOST_MPL_CFG_GCC) && BOOST_MPL_CFG_GCC >= 0x0302 \ + && ( defined(BOOST_MPL_CFG_GCC) \ || defined(__MWERKS__) && __MWERKS__ >= 0x3000 \ ) diff --git a/include/boost/mpl/eval_if.hpp b/include/boost/mpl/eval_if.hpp index 0ad8729..40d4880 100644 --- a/include/boost/mpl/eval_if.hpp +++ b/include/boost/mpl/eval_if.hpp @@ -29,8 +29,7 @@ template< , typename BOOST_MPL_AUX_NA_PARAM(F2) > struct eval_if -#if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, >= 0x0300) \ - && BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304)) +#if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304)) { typedef typename if_::type f_; typedef typename f_::type type; @@ -49,8 +48,7 @@ template< , typename F2 > struct eval_if_c -#if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, >= 0x0300) \ - && BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304)) +#if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304)) { typedef typename if_c::type f_; typedef typename f_::type type;