[Boost-commit] svn:boost r69101 - sandbox/interthreads/boost/interthreads

Subject: [Boost-commit] svn:boost r69101 - sandbox/interthreads/boost/interthreads
From: vicente.botet_at_[hidden]
Date: 2011-02-20 15:08:41

Author: viboes
Date: 2011-02-20 15:08:39 EST (Sun, 20 Feb 2011)
New Revision: 69101
URL: http://svn.boost.org/trac/boost/changeset/69101

Log:
Interthreads: Inhibit variadic templates and rvalue code as it don't works yet
Text files modified: 
   sandbox/interthreads/boost/interthreads/thread_decorator.hpp |    20 ++++++++++----------                    
   1 files changed, 10 insertions(+), 10 deletions(-)

Modified: sandbox/interthreads/boost/interthreads/thread_decorator.hpp
==============================================================================
--- sandbox/interthreads/boost/interthreads/thread_decorator.hpp	(original)
+++ sandbox/interthreads/boost/interthreads/thread_decorator.hpp	2011-02-20 15:08:39 EST (Sun, 20 Feb 2011)
@@ -51,21 +51,21 @@
             return *this;
         }
 
-#if defined(BOOST_HAS_VARIADIC_TMPL)
+#if defined(BOOST_HAS_VARIADIC_TMPL2)
 #if defined(BOOST_HAS_RVALUE_REFS)
-        template <typename Callable, typename Arg...>
-        explicit basic_thread_decorator(Callable&& f, ...Arg&& args)
-            : func_(detail::make_decorator_function(boost::bind(boost::type<void>(),static_cast<F&&>(f),...args))) {};
+        template <typename Callable, typename ...Arg>
+        explicit basic_thread_decorator(Callable&& f, Arg&& ... args)
+            : func_(detail::make_decorator_function(boost::bind(boost::type<void>(),static_cast<Callable&&>(f),args...))) {};
 #else
-        template <typename Callable, typename Arg...>
-        explicit basic_thread_decorator(Callable f, ...Arg args)
-            : func_(detail::make_decorator_function(boost::bind(boost::type<void>(),f,...args))) {};
+        template <typename Callable, typename ...Arg>
+        explicit basic_thread_decorator(Callable f, Arg ... args)
+            : func_(detail::make_decorator_function(boost::bind(boost::type<void>(),f,args ...))) {};
 #endif
 #else // !defined(BOOST_HAS_VARIADIC_TMPL)
-#if defined(BOOST_HAS_RVALUE_REFS)
+#if defined(BOOST_HAS_RVALUE_REFS2)
         template <typename Callable>
         explicit basic_thread_decorator(Callable&& f)
-            : func_(detail::make_decorator_function(static_cast<F&&>(f))) {};
+            : func_(detail::make_decorator_function(static_cast<Callable&&>(f))) {};
 #else // !defined(BOOST_HAS_RVALUE_REFS)
 #ifdef BOOST_INTERTHREADS_THREAD_DECORATOR_MOVE
 #ifndef BOOST_NO_SFINAE
@@ -74,7 +74,7 @@
 #else // BOOST_NO_SFINAE
         template <class Callable>
         explicit basic_thread_decorator(Callable f
-            ,typename disable_if<boost::is_convertible<F&,boost::detail::thread_move_t<F> >, detail::dummy* >::type=0)
+            ,typename disable_if<boost::is_convertible<F&,boost::detail::thread_move_t<Callable> >, detail::dummy* >::type=0)
             : func_(detail::make_decorator_function(f)) {}
 #endif // BOOST_NO_SFINAE
         template <class Callable>