diff --git a/include/boost/concept/assert.hpp b/include/boost/concept/assert.hpp old mode 100755 new mode 100644 index 80eca81..cf98179 --- a/include/boost/concept/assert.hpp +++ b/include/boost/concept/assert.hpp @@ -18,8 +18,7 @@ # if !defined(BOOST_NO_OLD_CONCEPT_SUPPORT) \ && !defined(BOOST_NO_SFINAE) \ \ - && !(BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4)) \ - && !(BOOST_WORKAROUND(__GNUC__, == 2)) + && !(BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4)) // Note: gcc-2.96 through 3.3.x have some SFINAE, but no ability to // check for the presence of particularmember functions. diff --git a/include/boost/concept/detail/concept_def.hpp b/include/boost/concept/detail/concept_def.hpp old mode 100755 new mode 100644 index 79f628e..750561e --- a/include/boost/concept/detail/concept_def.hpp +++ b/include/boost/concept/detail/concept_def.hpp @@ -15,22 +15,6 @@ // // Also defines an equivalent SomeNameConcept for backward compatibility. // Maybe in the next release we can kill off the "Concept" suffix for good. -#if BOOST_WORKAROUND(__GNUC__, <= 3) -# define BOOST_concept(name, params) \ - template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) > \ - struct name; /* forward declaration */ \ - \ - template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) > \ - struct BOOST_PP_CAT(name,Concept) \ - : name< BOOST_PP_SEQ_ENUM(params) > \ - { \ - /* at least 2.96 and 3.4.3 both need this */ \ - BOOST_PP_CAT(name,Concept)(); \ - }; \ - \ - template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) > \ - struct name -#else # define BOOST_concept(name, params) \ template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) > \ struct name; /* forward declaration */ \ @@ -43,7 +27,6 @@ \ template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) > \ struct name -#endif // Helper for BOOST_concept, above. # define BOOST_CONCEPT_typename(r, ignored, index, t) \ diff --git a/include/boost/concept/requires.hpp b/include/boost/concept/requires.hpp index 024ba74..7a74d2f 100644 --- a/include/boost/concept/requires.hpp +++ b/include/boost/concept/requires.hpp @@ -15,9 +15,6 @@ namespace boost { template struct requires_ : More { -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) - typedef typename More::type type; -# endif BOOST_CONCEPT_ASSERT((Model)); }; @@ -34,9 +31,6 @@ struct _requires_ template struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type { -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) - typedef typename ::boost::parameter::aux::unaryfunptr_arg_type::type type; -# endif }; # if BOOST_WORKAROUND(BOOST_INTEL_WIN, BOOST_TESTED_AT(1010)) @@ -45,7 +39,7 @@ struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type # define BOOST_CONCEPT_REQUIRES_(r,data,t) + (::boost::_requires_::value) # endif -#if defined(NDEBUG) || BOOST_WORKAROUND(BOOST_MSVC, < 1300) +#if defined(NDEBUG) # define BOOST_CONCEPT_REQUIRES(models, result) \ typename ::boost::parameter::aux::unaryfunptr_arg_type::type diff --git a/include/boost/concept/usage.hpp b/include/boost/concept/usage.hpp index 21547c3..e73370f 100644 --- a/include/boost/concept/usage.hpp +++ b/include/boost/concept/usage.hpp @@ -10,12 +10,6 @@ namespace boost { namespace concepts { -# if BOOST_WORKAROUND(__GNUC__, == 2) - -# define BOOST_CONCEPT_USAGE(model) ~model() - -# else - template struct usage_requirements { @@ -37,8 +31,6 @@ struct usage_requirements # endif -# endif - }} // namespace boost::concepts #endif // BOOST_CONCEPT_USAGE_DWA2006919_HPP