diff --git a/src/cxx_supportlib/vendor-modified/boost/asio.hpp b/src/cxx_supportlib/vendor-modified/boost/asio.hpp index a0f93111a9..f8f9eb5a5a 100644 --- a/src/cxx_supportlib/vendor-modified/boost/asio.hpp +++ b/src/cxx_supportlib/vendor-modified/boost/asio.hpp @@ -188,15 +188,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include diff --git a/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp b/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp index 3717311060..ffcb728264 100644 --- a/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp +++ b/src/cxx_supportlib/vendor-modified/boost/thread/detail/thread.hpp @@ -166,7 +166,7 @@ namespace boost typedef thread_attributes attributes; BOOST_THREAD_MOVABLE_ONLY(thread) - private: + protected: struct dummy; @@ -174,7 +174,7 @@ namespace boost 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 index 2a5094bd5a..5c2d9cb853 100644 --- 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 #include #include +#include #include @@ -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 index 22f95139ae..d458fb5314 100644 --- 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 void // call_once(once_flag& flag, Callable&& func, Args&&... args); template -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);