Subject: [Boost-commit] svn:boost r86018 - trunk/boost/function
From: steveire_at_[hidden]
Date: 2013-09-29 20:16:56
Author: skelly
Date: 2013-09-29 20:16:55 EDT (Sun, 29 Sep 2013)
New Revision: 86018
URL: http://svn.boost.org/trac/boost/changeset/86018
Log:
Function: Remove obsolete MSVC version checks.
Text files modified:
trunk/boost/function/function_base.hpp | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
Modified: trunk/boost/function/function_base.hpp
==============================================================================
--- trunk/boost/function/function_base.hpp Sun Sep 29 17:15:11 2013 (r86017)
+++ trunk/boost/function/function_base.hpp 2013-09-29 20:16:55 EDT (Sun, 29 Sep 2013) (r86018)
@@ -66,11 +66,11 @@
# define BOOST_FUNCTION_COMPARE_TYPE_ID(X,Y) ((X)==(Y))
#endif
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
+#if defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
# define BOOST_FUNCTION_TARGET_FIX(x) x
#else
# define BOOST_FUNCTION_TARGET_FIX(x)
-#endif // not MSVC
+#endif // __ICL etc
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x5A0)
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
@@ -661,11 +661,7 @@
}
template<typename Functor>
-#if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- const Functor* target( Functor * = 0 ) const
-#else
const Functor* target() const
-#endif
{
if (!vtable) return 0;
@@ -683,11 +679,7 @@
template<typename F>
bool contains(const F& f) const
{
-#if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- if (const F* fp = this->target( (F*)0 ))
-#else
if (const F* fp = this->template target<F>())
-#endif
{
return function_equal(*fp, f);
} else {