Ticket #1929: thread-borland-workaround.patch

boost/thread/win32/thread.hpp

@@ -214 +214 @@
         }
 #else
         template<typename F>
-        static inline detail::thread_data_ptr make_thread_info(F f)
+        static inline detail::thread_data_base* make_thread_info(F f)
         {
             return detail::heap_new<thread_data<F> >(f);
         }
@@ -228 +228 @@
         thread();
         ~thread();
 
+        void __boost_workaround_to_set_thread_info(detail::thread_data_base* tinfo);
+
 #ifdef BOOST_HAS_RVALUE_REFS
         template <class F>
         thread(F&& f):
@@ -237 +239 @@
         }
 #else
         template <class F>
-        explicit thread(F f):
-            thread_info(make_thread_info(f))
+        explicit thread(F f)
         {
+            detail::thread_data_base* const tinfo = make_thread_info(f);
+            __boost_workaround_to_set_thread_info(tinfo);
             start_thread();
         }
 

libs/thread/src/win32/thread.cpp

@@ -189 +189 @@
     thread::thread()
     {}
 
+    void thread::__boost_workaround_to_set_thread_info(detail::thread_data_base* const tinfo)
+    {
+        thread_info = tinfo;
+    }
+
     void thread::start_thread()
     {
         uintptr_t const new_thread=_beginthreadex(0,0,&thread_start_function,thread_info.get(),CREATE_SUSPENDED,&thread_info->id);