-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[folly/fizz]Upgrade version. (#8765)
* [folly/fizz]Upgrade version. * [fizz]Upgrade to v2019.10.28.00.
- Loading branch information
Showing
5 changed files
with
31 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: fizz | ||
Version: 2019.07.08.00 | ||
Version: 2019.10.28.00 | ||
Build-Depends: folly, openssl, libsodium, zlib | ||
Description: a TLS 1.3 implementation by Facebook |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
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; | ||
diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp | ||
index 5cc3731..86a4a0b 100644 | ||
--- a/folly/portability/PThread.cpp | ||
+++ b/folly/portability/PThread.cpp | ||
@@ -18,6 +18,9 @@ | ||
|
||
#if !FOLLY_HAVE_PTHREAD && defined(_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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters