mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 18:49:00 +08:00
9d473a6954
* [boost] Update to 1.70.0 * [boost-build] Update to 1.70.0 * [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70 * [boost-variant] Revert to 1.69 due to regression [fizz][folly] Update and fix for boost 1.70 [libsodium] Use CMake buildsystem replacement to enable non-Windows * [wangle] Update. [folly] Avoid linking debug libs in release. * [pcl] Fix compatibility with boost 1.70 * [fizz] Handle merge regression * [arrow] Modernize and fix cmake targets * [boost-type-traits] Update patches for arm64-windows * [boost-locale] Add boost-system and boost-thread as arm64 dependencies * [ompl] Add missing boost-timer dependency
24 lines
766 B
Diff
24 lines
766 B
Diff
diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
|
|
index d75e012..03019f3 100644
|
|
--- a/folly/portability/PThread.cpp
|
|
+++ b/folly/portability/PThread.cpp
|
|
@@ -18,6 +18,9 @@
|
|
|
|
#if !FOLLY_HAVE_PTHREAD && _WIN32
|
|
#include <boost/thread/tss.hpp> // @manual
|
|
+#include <boost/thread/exceptions.hpp>
|
|
+#include <boost/shared_ptr.hpp>
|
|
+#include <boost/thread/thread_only.hpp>
|
|
|
|
#include <errno.h>
|
|
|
|
@@ -684,7 +687,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
|
|
// function, which we don't want to do.
|
|
boost::detail::set_tss_data(
|
|
realKey,
|
|
- boost::shared_ptr<boost::detail::tss_cleanup_function>(),
|
|
+ 0,0,
|
|
const_cast<void*>(value),
|
|
false);
|
|
return 0;
|