patch boost

phusion · Jan 1, 2025 · 960a440 · 960a440
1 parent 72f9b29
commit 960a440
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/cxx_supportlib/vendor-modified/boost/asio.hpp b/src/cxx_supportlib/vendor-modified/boost/asio.hpp
@@ -188,15 +188,6 @@
 #include <boost/asio/uses_executor.hpp>
 #include <boost/asio/version.hpp>
 #include <boost/asio/wait_traits.hpp>
-#include <boost/asio/windows/basic_object_handle.hpp>
-#include <boost/asio/windows/basic_overlapped_handle.hpp>
-#include <boost/asio/windows/basic_random_access_handle.hpp>
-#include <boost/asio/windows/basic_stream_handle.hpp>
-#include <boost/asio/windows/object_handle.hpp>
-#include <boost/asio/windows/overlapped_handle.hpp>
-#include <boost/asio/windows/overlapped_ptr.hpp>
-#include <boost/asio/windows/random_access_handle.hpp>
-#include <boost/asio/windows/stream_handle.hpp>
 #include <boost/asio/writable_pipe.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/asio/write_at.hpp>

diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp
@@ -166,15 +166,15 @@ namespace boost
       typedef thread_attributes attributes;
 
       BOOST_THREAD_MOVABLE_ONLY(thread)
-    private:
+    protected:
 
         struct dummy;
 
         void release_handle();
 
         detail::thread_data_ptr thread_info;
 
-    private:
+    protected:
         bool start_thread_noexcept();
         bool start_thread_noexcept(const attributes& attr);
         void start_thread()

diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/exceptions.hpp
@@ -21,6 +21,7 @@
 #include <stdexcept>
 #include <boost/system/system_error.hpp>
 #include <boost/system/error_code.hpp>
+#include <oxt/tracable_exception.hpp>
 
 
 #include <boost/config/abi_prefix.hpp>
@@ -30,6 +31,7 @@ namespace boost
 
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
     class BOOST_SYMBOL_VISIBLE thread_interrupted
+      : public oxt::tracable_exception
     {};
 #endif
 

diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/once.hpp
@@ -38,7 +38,7 @@ namespace boost
   // template<class Callable, class ...Args> void
   // call_once(once_flag& flag, Callable&& func, Args&&... args);
 template<typename Function>
-inline void call_once(Function func,once_flag& flag)
+inline void call_once(Function func,boost::once_flag& flag)
 //inline void call_once(void (*func)(),once_flag& flag)
     {
         call_once(flag,func);