mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 03:49:08 +08:00
16e95cee85
Update `folly` and its related ports to the latest version
`2024.05.20.00`.
The recent update to `folly` includes this commit:
99767aa88e,
which caused downstream `rsocket` to fail with the following error
during build.
```
vcpkg\rsocket\src\84ec7fc921-d730564084\rsocket\RSocketServer.cpp(32): error C2665: 'folly::ThreadLocal<rsocket::SetupResumeAcceptor,rsocket::RSocketServer::SetupResumeAcceptorTag,void>::ThreadLocal': no overloaded function could convert all the argument types
```
A patch has now been submitted to fix this issue.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~The "supports" clause reflects platforms that may be fixed by
this new version.~
- [ ] ~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~
- [ ] ~Any patches that are no longer applied are deleted from the
port's directory.~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
14 lines
585 B
Diff
14 lines
585 B
Diff
diff --git a/rsocket/RSocketServer.cpp b/rsocket/RSocketServer.cpp
|
|
index 3a9f6b2..e749eb1 100644
|
|
--- a/rsocket/RSocketServer.cpp
|
|
+++ b/rsocket/RSocketServer.cpp
|
|
@@ -30,7 +30,7 @@ RSocketServer::RSocketServer(
|
|
std::shared_ptr<RSocketStats> stats)
|
|
: duplexConnectionAcceptor_(std::move(connectionAcceptor)),
|
|
setupResumeAcceptors_([] {
|
|
- return new rsocket::SetupResumeAcceptor{
|
|
+ return rsocket::SetupResumeAcceptor{
|
|
folly::EventBaseManager::get()->getExistingEventBase()};
|
|
}),
|
|
connectionSet_(std::make_unique<ConnectionSet>()),
|