[boost/f19] Update thread patch

Petr Machata pmachata at fedoraproject.org
Tue Jul 23 15:55:55 UTC 2013


commit b56c31ff13d418ddf1dd75bc8a5542614a5dab9a
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Jul 23 17:55:01 2013 +0200

    Update thread patch

 boost-1.53.0-thread-unused_typedef.patch |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/boost-1.53.0-thread-unused_typedef.patch b/boost-1.53.0-thread-unused_typedef.patch
index a1a3d40..3fd12c2 100644
--- a/boost-1.53.0-thread-unused_typedef.patch
+++ b/boost-1.53.0-thread-unused_typedef.patch
@@ -1,18 +1,23 @@
 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	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 detail::async_func<typename decay<F>::type> BF;
+-
+-          typedef detail::async_func<typename decay<F>::type> BF;
 -          typedef typename BF::result_type Rp;
- 
+-
    #endif
  #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 detail::async_func<typename decay<F>::type> BF;
+-
+-          typedef detail::async_func<typename decay<F>::type> BF;
 -          typedef typename BF::result_type Rp;
  #endif
  


More information about the scm-commits mailing list