Boost logo

Boost-Commit :

From: anthony_at_[hidden]
Date: 2008-07-18 09:42:12


Author: anthonyw
Date: 2008-07-18 09:42:10 EDT (Fri, 18 Jul 2008)
New Revision: 47554
URL: http://svn.boost.org/trac/boost/changeset/47554

Log:
Borland-specific fixes should apply to all compilers for which enable_if is broken: check for BOOST_NO_SFINAE instead
Text files modified:
   trunk/boost/thread/detail/move.hpp | 4 ++--
   trunk/boost/thread/detail/thread.hpp | 2 +-
   trunk/boost/thread/locks.hpp | 4 ++--
   3 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/thread/detail/move.hpp
==============================================================================
--- trunk/boost/thread/detail/move.hpp (original)
+++ trunk/boost/thread/detail/move.hpp 2008-07-18 09:42:10 EDT (Fri, 18 Jul 2008)
@@ -6,7 +6,7 @@
 #ifndef BOOST_THREAD_MOVE_HPP
 #define BOOST_THREAD_MOVE_HPP
 
-#ifndef __BORLANDC__
+#ifndef BOOST_NO_SFINAE
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #endif
@@ -39,7 +39,7 @@
         };
     }
 
-#ifndef __BORLANDC__
+#ifndef BOOST_NO_SFINAE
     template<typename T>
     typename enable_if<boost::is_convertible<T&,detail::thread_move_t<T> >, detail::thread_move_t<T> >::type move(T& t)
     {

Modified: trunk/boost/thread/detail/thread.hpp
==============================================================================
--- trunk/boost/thread/detail/thread.hpp (original)
+++ trunk/boost/thread/detail/thread.hpp 2008-07-18 09:42:10 EDT (Fri, 18 Jul 2008)
@@ -173,7 +173,7 @@
         }
         
 #else
-#ifdef __BORLANDC__
+#ifdef BOOST_NO_SFINAE
         template <class F>
         explicit thread(F f):
             thread_info(make_thread_info(f))

Modified: trunk/boost/thread/locks.hpp
==============================================================================
--- trunk/boost/thread/locks.hpp (original)
+++ trunk/boost/thread/locks.hpp 2008-07-18 09:42:10 EDT (Fri, 18 Jul 2008)
@@ -17,7 +17,7 @@
 {
     struct xtime;
 
-#ifndef __BORLANDC__
+#ifndef BOOST_NO_SFINAE
     namespace detail
     {
         template<typename T>
@@ -113,7 +113,7 @@
         class try_lock_wrapper;
     }
     
-#ifdef __BORLANDC__
+#ifdef BOOST_NO_SFINAE
     template<typename T>
     struct is_mutex_type<unique_lock<T> >
     {


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