remove patch files that are no longer needed.

Fri, 04 Mar 2011 12:53:10 -0800

author
Andrew A. de Laix <alain@lindenlab.com>
date
Fri, 04 Mar 2011 12:53:10 -0800
changeset 17
6ceb57105738
parent 16
f52596dba2a6
child 18
0af38655d170

remove patch files that are no longer needed.

boost-coroutine-2009-04-30.tar.gz file | annotate | diff | revisions
boost-coroutine-2009-12-01.patch file | annotate | diff | revisions
boost-coroutine-2009-12-01.tar.gz file | annotate | diff | revisions
boost-coroutine-linden-2.patch file | annotate | diff | revisions
boost-coroutine-linden.patch file | annotate | diff | revisions
function_template_for_c++0x.patch file | annotate | diff | revisions
     1.1 Binary file boost-coroutine-2009-04-30.tar.gz has changed
     2.1 --- a/boost-coroutine-2009-12-01.patch	Fri Mar 04 12:51:59 2011 -0800
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,162 +0,0 @@
     2.4 -diff -rc boost-coroutine/boost/coroutine/coroutine.hpp /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/coroutine.hpp
     2.5 -*** boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 29 14:41:05 2009
     2.6 ---- /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/coroutine.hpp	Tue Dec  1 15:25:52 2009
     2.7 -***************
     2.8 -*** 258,265 ****
     2.9 -      result_type call_impl(arg_slot_type args) {
    2.10 -        BOOST_ASSERT(m_pimpl);
    2.11 -        m_pimpl->bind_args(&args);
    2.12 -!       result_slot_type * ptr;
    2.13 -!       m_pimpl->bind_result_pointer(&ptr);
    2.14 -        m_pimpl->invoke();
    2.15 -  
    2.16 -        return detail::fix_result<result_slot_traits>(*m_pimpl->result());
    2.17 ---- 261,267 ----
    2.18 -      result_type call_impl(arg_slot_type args) {
    2.19 -        BOOST_ASSERT(m_pimpl);
    2.20 -        m_pimpl->bind_args(&args);
    2.21 -!       BOOST_DEDUCED_TYPENAME impl_type::local_result_slot_ptr ptr(m_pimpl);
    2.22 -        m_pimpl->invoke();
    2.23 -  
    2.24 -        return detail::fix_result<result_slot_traits>(*m_pimpl->result());
    2.25 -***************
    2.26 -*** 270,277 ****
    2.27 -      call_impl_nothrow(arg_slot_type args) {
    2.28 -        BOOST_ASSERT(m_pimpl);
    2.29 -        m_pimpl->bind_args(&args);
    2.30 -!       result_slot_type * ptr;
    2.31 -!       m_pimpl->bind_result_pointer(&ptr);
    2.32 -        if(!m_pimpl->wake_up())
    2.33 -  	return detail::optional_result<result_type>();
    2.34 -  
    2.35 ---- 272,278 ----
    2.36 -      call_impl_nothrow(arg_slot_type args) {
    2.37 -        BOOST_ASSERT(m_pimpl);
    2.38 -        m_pimpl->bind_args(&args);
    2.39 -!       BOOST_DEDUCED_TYPENAME impl_type::local_result_slot_ptr ptr(m_pimpl);
    2.40 -        if(!m_pimpl->wake_up())
    2.41 -  	return detail::optional_result<result_type>();
    2.42 -  
    2.43 -diff -rc boost-coroutine/boost/coroutine/detail/coroutine_impl.hpp /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/detail/coroutine_impl.hpp
    2.44 -*** boost-coroutine/boost/coroutine/detail/coroutine_impl.hpp	Sun Aug 20 13:11:09 2006
    2.45 ---- /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/detail/coroutine_impl.hpp	Tue Dec  1 16:04:48 2009
    2.46 -***************
    2.47 -*** 89,95 ****
    2.48 -      }
    2.49 -      
    2.50 -      void bind_result(result_slot_type* res) {
    2.51 -!       *m_result = res;
    2.52 -      }
    2.53 -  
    2.54 -      // Another level of indirecition is needed to handle
    2.55 ---- 89,98 ----
    2.56 -      }
    2.57 -      
    2.58 -      void bind_result(result_slot_type* res) {
    2.59 -!       // This used to be unconditional. But m_result isn't always valid.
    2.60 -!       if (m_result) {
    2.61 -!         *m_result = res;
    2.62 -!       }
    2.63 -      }
    2.64 -  
    2.65 -      // Another level of indirecition is needed to handle
    2.66 -***************
    2.67 -*** 102,120 ****
    2.68 -        return m_result;
    2.69 -      }
    2.70 -  
    2.71 -      // This function must be called only for void
    2.72 -      // coroutines. It wakes up the coroutine.
    2.73 -      // Entering the wait state does not cause this
    2.74 -      // method to throw.
    2.75 -      void run() {
    2.76 -        arg_slot_type void_args;
    2.77 --       result_slot_type * ptr = 0;
    2.78 -        
    2.79 -        // This dummy binding is required because
    2.80 -        // do_call expect args() and result()
    2.81 -        // to return a non NULL result.
    2.82 -        bind_args(&void_args);
    2.83 -!       bind_result_pointer(&ptr);
    2.84 -        this->wake_up();
    2.85 -      }
    2.86 -    protected:
    2.87 ---- 105,157 ----
    2.88 -        return m_result;
    2.89 -      }
    2.90 -  
    2.91 -+     /// This helper class packages data/logic originally found inline in
    2.92 -+     /// coroutine::call_impl() and call_impl_nothrow(), also
    2.93 -+     /// coroutine_impl::run().
    2.94 -+     class local_result_slot_ptr
    2.95 -+     {
    2.96 -+     public:
    2.97 -+         local_result_slot_ptr(pointer pimpl):
    2.98 -+             m_pimpl(pimpl),
    2.99 -+             m_ptr(NULL)
   2.100 -+         {
   2.101 -+             m_pimpl->bind_result_pointer(&m_ptr);
   2.102 -+         }
   2.103 -+         ~local_result_slot_ptr()
   2.104 -+         {
   2.105 -+             // In the original use case, a coroutine could only be resumed by
   2.106 -+             // calling coroutine::operator() again, which would rebind the
   2.107 -+             // result pointer to a new valid value. But with the introduction
   2.108 -+             // of futures, it's possible to suspend a coroutine by waiting on
   2.109 -+             // a future object -- thus destroying the local result_slot_type*
   2.110 -+             // -- then resume that coroutine by calling the future's callback,
   2.111 -+             // bypassing coroutine::operator(). This used to leave an old,
   2.112 -+             // invalid result pointer in effect. Subsequent coroutine exit
   2.113 -+             // wrote through that pointer, munging a word of stack. Now we
   2.114 -+             // make a point of setting the bound result pointer NULL when the
   2.115 -+             // result_slot_type* to which it pointed vanishes, so that any
   2.116 -+             // attempt to dereference it will at least self-identify --
   2.117 -+             // instead of producing arbitrary undefined behavior.
   2.118 -+             m_pimpl->bind_result_pointer(NULL);
   2.119 -+         }
   2.120 -+ 
   2.121 -+     private:
   2.122 -+         pointer m_pimpl;
   2.123 -+         result_slot_type* m_ptr;
   2.124 -+     };
   2.125 -+ 
   2.126 -      // This function must be called only for void
   2.127 -      // coroutines. It wakes up the coroutine.
   2.128 -      // Entering the wait state does not cause this
   2.129 -      // method to throw.
   2.130 -      void run() {
   2.131 -        arg_slot_type void_args;
   2.132 -        
   2.133 -        // This dummy binding is required because
   2.134 -        // do_call expect args() and result()
   2.135 -        // to return a non NULL result.
   2.136 -        bind_args(&void_args);
   2.137 -!       local_result_slot_pointer(this);
   2.138 -        this->wake_up();
   2.139 -      }
   2.140 -    protected:
   2.141 -diff -rc boost-coroutine/boost/coroutine/detail/self.hpp /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/detail/self.hpp
   2.142 -*** boost-coroutine/boost/coroutine/detail/self.hpp	Sun Aug 20 13:11:09 2006
   2.143 ---- /Users/nat/linden/viewer-20-topush/libraries/include/boost/coroutine/detail/self.hpp	Wed Aug  5 16:50:17 2009
   2.144 -***************
   2.145 -*** 217,222 ****
   2.146 ---- 217,235 ----
   2.147 -        BOOST_ASSERT(m_pimpl);
   2.148 -        return m_pimpl->pending();
   2.149 -      }
   2.150 -+ 
   2.151 -+     /// @c true only if this @c self object was created by the passed @a coroutine
   2.152 -+     template <typename SomeCoroutine>
   2.153 -+     bool is_from(const SomeCoroutine& coroutine) const
   2.154 -+     {
   2.155 -+       // get_impl() only accepts non-const ref... a mistake, IMO.
   2.156 -+       return static_cast<void*>(coroutine_accessor::get_impl(const_cast<SomeCoroutine&>(coroutine)).get()) ==
   2.157 -+              static_cast<void*>(m_pimpl);
   2.158 -+     }
   2.159 -+ 
   2.160 -+     /// opaque token used to correlate this 'self' with its corresponding coroutine
   2.161 -+     void* get_id() const { return m_pimpl; }
   2.162 -+ 
   2.163 -    private:
   2.164 -      coroutine_self(impl_type * pimpl, detail::init_from_impl_tag) :
   2.165 -        m_pimpl(pimpl) {}
     3.1 Binary file boost-coroutine-2009-12-01.tar.gz has changed
     4.1 --- a/boost-coroutine-linden-2.patch	Fri Mar 04 12:51:59 2011 -0800
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,31 +0,0 @@
     4.4 ---- boost/coroutine/detail/context_windows.hpp.orig	2010-06-30 17:02:24.593750000 -0700
     4.5 -+++ boost/coroutine/detail/context_windows.hpp	2010-06-30 16:51:33.500000000 -0700
     4.6 -@@ -35,9 +35,11 @@
     4.7 - // And no, I have no idea why this symbol isn't being set appropriately by
     4.8 - // the build environment.
     4.9 - #define WIN32_LEAN_AND_MEAN
    4.10 -+#ifndef _WIN32_WINNT
    4.11 - #define _WIN32_WINNT 0x0600
    4.12 - // The above #define will only affect <windows.h> if it has not yet been
    4.13 - // #included by something else!
    4.14 -+#endif // _WIN32_WINNT
    4.15 - #if defined(WINBASEAPI)
    4.16 - #error You must #include coroutine headers before anything that #includes <windows.h>
    4.17 - #endif
    4.18 -@@ -63,12 +65,15 @@
    4.19 - 		
    4.20 -     /*
    4.21 -      * Return true if current thread is a fiber.
    4.22 --     * FIXME: on longhorn shoud use IsThreadAFiber
    4.23 -      */
    4.24 -     inline
    4.25 -     bool is_fiber() {
    4.26 -+#if _WIN32_WINNT >= 0x0600
    4.27 -+      return bool(IsThreadAFiber());
    4.28 -+#else
    4.29 -       fiber_ptr current = GetCurrentFiber();
    4.30 -       return current != 0 && current != fiber_magic;
    4.31 -+#endif
    4.32 -     }
    4.33 - 
    4.34 -     /*
     5.1 --- a/boost-coroutine-linden.patch	Fri Mar 04 12:51:59 2011 -0800
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,62 +0,0 @@
     5.4 -diff -rc ../boost-coroutine/boost/coroutine/coroutine.hpp boost-coroutine/boost/coroutine/coroutine.hpp
     5.5 -*** ../boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 29 14:41:05 2009
     5.6 ---- boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 22 09:35:22 2009
     5.7 -***************
     5.8 -*** 28,33 ****
     5.9 ---- 28,36 ----
    5.10 -  
    5.11 -  #ifndef BOOST_COROUTINE_COROUTINE_HPP_20060512
    5.12 -  #define BOOST_COROUTINE_COROUTINE_HPP_20060512
    5.13 -+ // On Linux systems, use native swapcontext() et al. rather than
    5.14 -+ // Boost.Coroutine homebrew assembler
    5.15 -+ #define BOOST_COROUTINE_NO_ASM
    5.16 -  // default_context_impl.hpp must be first for weird Apple bug
    5.17 -  #include <boost/coroutine/detail/default_context_impl.hpp>
    5.18 -  #include <cstddef>
    5.19 -diff -rc ../boost-coroutine/boost/coroutine/future.hpp boost-coroutine/boost/coroutine/future.hpp
    5.20 -*** ../boost-coroutine/boost/coroutine/future.hpp	Wed Apr 29 14:41:05 2009
    5.21 ---- boost-coroutine/boost/coroutine/future.hpp	Wed Apr 22 09:35:26 2009
    5.22 -***************
    5.23 -*** 33,38 ****
    5.24 ---- 33,41 ----
    5.25 -  #ifndef BOOST_COROUTINE_WAIT_MAX
    5.26 -  #define BOOST_COROUTINE_WAIT_MAX 10
    5.27 -  #endif
    5.28 -+ // On Linux systems, use native swapcontext() et al. rather than
    5.29 -+ // Boost.Coroutine homebrew assembler
    5.30 -+ #define BOOST_COROUTINE_NO_ASM
    5.31 -  // default_context_impl.hpp must be first for weird Apple bug
    5.32 -  #include <boost/coroutine/detail/default_context_impl.hpp>
    5.33 -  #include <boost/none.hpp>
    5.34 -diff -u -r old/boost/coroutine/detail/coroutine_impl.hpp new/boost/coroutine/detail/coroutine_impl.hpp
    5.35 ---- old/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 17:10:02.000000000 +0100
    5.36 -+++ new/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 19:22:11.000000000 +0100
    5.37 -@@ -56,7 +56,7 @@
    5.38 -     typedef ContextImpl context_impl;
    5.39 -     typedef CoroutineType coroutine_type;
    5.40 -     typedef coroutine_impl<coroutine_type, context_impl> type;
    5.41 --    typedef context_base<context_impl> context_base;
    5.42 -+    typedef context_base<context_impl> context_base_type;
    5.43 -     typedef typename coroutine_type::arg_slot_type arg_slot_type;
    5.44 -     typedef typename coroutine_type::result_type result_type;
    5.45 -     typedef typename coroutine_type::result_slot_type result_slot_type;
    5.46 -@@ -65,7 +65,7 @@
    5.47 -   
    5.48 -     template<typename DerivedType>
    5.49 - 	coroutine_impl(DerivedType * this_, std::ptrdiff_t stack_size) :
    5.50 --      context_base(*this_, stack_size),
    5.51 -+      context_base_type(*this_, stack_size),
    5.52 - 	m_arg(0),
    5.53 - 	m_result(0){}
    5.54 -                 
    5.55 -diff -u -r old/boost/coroutine/detail/posix_utility.hpp new/boost/coroutine/detail/posix_utility.hpp
    5.56 ---- old/boost/coroutine/detail/posix_utility.hpp	2009-04-24 21:30:44.000000000 +0100
    5.57 -+++ new/boost/coroutine/detail/posix_utility.hpp	2009-10-20 19:21:27.000000000 +0100
    5.58 -@@ -39,6 +39,7 @@
    5.59 - #include <cstddef>
    5.60 - #include <cstdlib>
    5.61 - #include <iostream>
    5.62 -+#include <cstring>
    5.63 - #include <boost/type_traits.hpp>
    5.64 - #if defined(_POSIX_MAPPED_FILES) && _POSIX_MAPPED_FILES > 0
    5.65 - #include <sys/mman.h>
     6.1 --- a/function_template_for_c++0x.patch	Fri Mar 04 12:51:59 2011 -0800
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,22 +0,0 @@
     6.4 -Index: function_template.hpp
     6.5 -===================================================================
     6.6 ---- function_template.hpp	(revision 61663)
     6.7 -+++ function_template.hpp	(working copy)
     6.8 -@@ -536,7 +536,7 @@
     6.9 -           // objects, so we invoke through mem_fn() but we retain the
    6.10 -           // right target_type() values.
    6.11 -           if (f) {
    6.12 --            this->assign_to(mem_fn(f), functor);
    6.13 -+            this->assign_to(boost::mem_fn(f), functor);
    6.14 -             return true;
    6.15 -           } else {
    6.16 -             return false;
    6.17 -@@ -549,7 +549,7 @@
    6.18 -           // objects, so we invoke through mem_fn() but we retain the
    6.19 -           // right target_type() values.
    6.20 -           if (f) {
    6.21 --            this->assign_to_a(mem_fn(f), functor, a);
    6.22 -+            this->assign_to_a(boost::mem_fn(f), functor, a);
    6.23 -             return true;
    6.24 -           } else {
    6.25 -             return false;

mercurial