[Boost-commit] svn:boost r48922 - trunk/boost/function

Subject: [Boost-commit] svn:boost r48922 - trunk/boost/function
From: dgregor_at_[hidden]
Date: 2008-09-22 20:26:21

Author: dgregor
Date: 2008-09-22 20:26:21 EDT (Mon, 22 Sep 2008)
New Revision: 48922
URL: http://svn.boost.org/trac/boost/changeset/48922

Log:
CodeGear C++ fix, from Nicola Musatti. Fixes #2325
Text files modified: 
   trunk/boost/function/function_base.hpp |     3 ++-                                     
   1 files changed, 2 insertions(+), 1 deletions(-)

Modified: trunk/boost/function/function_base.hpp
==============================================================================
--- trunk/boost/function/function_base.hpp	(original)
+++ trunk/boost/function/function_base.hpp	2008-09-22 20:26:21 EDT (Mon, 22 Sep 2008)
@@ -22,6 +22,7 @@
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/composite_traits.hpp>
+#include <boost/type_traits/ice.hpp>
 #include <boost/ref.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/detail/workaround.hpp>
@@ -66,7 +67,7 @@
 #  define BOOST_FUNCTION_TARGET_FIX(x)
 #endif // not MSVC
 
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x5A0)
 #  define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)              \
       typename ::boost::enable_if_c<(::boost::type_traits::ice_not<          \
                             (::boost::is_integral<Functor>::value)>::value), \