Update thread patch
This commit is contained in:
parent
7fa0ea18d9
commit
b56c31ff13
@ -1,18 +1,23 @@
|
|||||||
diff -up boost_1_53_0/boost/thread/future.hpp\~ boost_1_53_0/boost/thread/future.hpp
|
diff -up boost_1_53_0/boost/thread/future.hpp\~ boost_1_53_0/boost/thread/future.hpp
|
||||||
--- boost_1_53_0/boost/thread/future.hpp~ 2012-12-16 20:01:45.000000000 +0100
|
--- boost_1_53_0/boost/thread/future.hpp~ 2012-12-16 20:01:45.000000000 +0100
|
||||||
+++ boost_1_53_0/boost/thread/future.hpp 2013-07-23 16:50:27.044995968 +0200
|
+++ boost_1_53_0/boost/thread/future.hpp 2013-07-23 16:50:27.044995968 +0200
|
||||||
@@ -2913,7 +2913,6 @@ namespace boost
|
@@ -2911,10 +2913,6 @@ namespace boost
|
||||||
|
{
|
||||||
|
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
||||||
typedef packaged_task<R()> packaged_task_type;
|
typedef packaged_task<R()> packaged_task_type;
|
||||||
|
-
|
||||||
typedef detail::async_func<typename decay<F>::type> BF;
|
- typedef detail::async_func<typename decay<F>::type> BF;
|
||||||
- typedef typename BF::result_type Rp;
|
- typedef typename BF::result_type Rp;
|
||||||
|
-
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
@@ -2925,7 +2924,6 @@ namespace boost
|
template <class F>
|
||||||
|
@@ -2925,9 +2924,6 @@ namespace boost
|
||||||
|
{
|
||||||
|
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
||||||
typedef packaged_task<R> packaged_task_type;
|
typedef packaged_task<R> packaged_task_type;
|
||||||
|
-
|
||||||
typedef detail::async_func<typename decay<F>::type> BF;
|
- typedef detail::async_func<typename decay<F>::type> BF;
|
||||||
- typedef typename BF::result_type Rp;
|
- typedef typename BF::result_type Rp;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user