mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
[asio]: update to 1.28.1 (#33977)
This commit is contained in:
parent
293512465b
commit
163ec99467
@ -1,131 +0,0 @@
|
||||
diff --git a/asio/include/asio/experimental/impl/coro.hpp b/asio/include/asio/experimental/impl/coro.hpp
|
||||
index a4d8d277..9f01687e 100644
|
||||
--- a/asio/include/asio/experimental/impl/coro.hpp
|
||||
+++ b/asio/include/asio/experimental/impl/coro.hpp
|
||||
@@ -1069,17 +1069,17 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
std::true_type /* error is noexcept */,
|
||||
std::true_type /* result is void */) //noexcept
|
||||
{
|
||||
- return [this, coro = coro_,
|
||||
+ return [this, coro_promise_ = coro_,
|
||||
h = std::forward<WaitHandler>(handler),
|
||||
exec = std::move(exec)]() mutable
|
||||
{
|
||||
- assert(coro);
|
||||
+ assert(coro_promise_);
|
||||
|
||||
- auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro);
|
||||
+ auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro_promise_);
|
||||
assert(ch && !ch.done());
|
||||
|
||||
- coro->awaited_from = post_coroutine(std::move(exec), std::move(h));
|
||||
- coro->reset_error();
|
||||
+ coro_promise_->awaited_from = post_coroutine(std::move(exec), std::move(h));
|
||||
+ coro_promise_->reset_error();
|
||||
ch.resume();
|
||||
};
|
||||
}
|
||||
@@ -1090,18 +1090,18 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
std::true_type /* error is noexcept */,
|
||||
std::false_type /* result is void */) //noexcept
|
||||
{
|
||||
- return [coro = coro_,
|
||||
+ return [coro_promise_ = coro_,
|
||||
h = std::forward<WaitHandler>(handler),
|
||||
exec = std::move(exec)]() mutable
|
||||
{
|
||||
- assert(coro);
|
||||
+ assert(coro_promise_);
|
||||
|
||||
- auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro);
|
||||
+ auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro_promise_);
|
||||
assert(ch && !ch.done());
|
||||
|
||||
- coro->awaited_from = detail::post_coroutine(
|
||||
- exec, std::move(h), coro->result_).handle;
|
||||
- coro->reset_error();
|
||||
+ coro_promise_->awaited_from = detail::post_coroutine(
|
||||
+ exec, std::move(h), coro_promise_->result_).handle;
|
||||
+ coro_promise_->reset_error();
|
||||
ch.resume();
|
||||
};
|
||||
}
|
||||
@@ -1111,16 +1111,16 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
std::false_type /* error is noexcept */,
|
||||
std::true_type /* result is void */)
|
||||
{
|
||||
- return [coro = coro_,
|
||||
+ return [coro_promise_ = coro_,
|
||||
h = std::forward<WaitHandler>(handler),
|
||||
exec = std::move(exec)]() mutable
|
||||
{
|
||||
- if (!coro)
|
||||
+ if (!coro_promise_)
|
||||
return asio::post(exec,
|
||||
asio::append(std::move(h),
|
||||
detail::coro_error<error_type>::invalid()));
|
||||
|
||||
- auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro);
|
||||
+ auto ch = detail::coroutine_handle<promise_type>::from_promise(*coro_promise_);
|
||||
if (!ch)
|
||||
return asio::post(exec,
|
||||
asio::append(std::move(h),
|
||||
@@ -1131,9 +1131,9 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
detail::coro_error<error_type>::done()));
|
||||
else
|
||||
{
|
||||
- coro->awaited_from = detail::post_coroutine(
|
||||
- exec, std::move(h), coro->error_).handle;
|
||||
- coro->reset_error();
|
||||
+ coro_promise_->awaited_from = detail::post_coroutine(
|
||||
+ exec, std::move(h), coro_promise_->error_).handle;
|
||||
+ coro_promise_->reset_error();
|
||||
ch.resume();
|
||||
}
|
||||
};
|
||||
@@ -1144,17 +1144,17 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
std::false_type /* error is noexcept */,
|
||||
std::false_type /* result is void */)
|
||||
{
|
||||
- return [coro = coro_,
|
||||
+ return [coro_promise_ = coro_,
|
||||
h = std::forward<WaitHandler>(handler),
|
||||
exec = std::move(exec)]() mutable
|
||||
{
|
||||
- if (!coro)
|
||||
+ if (!coro_promise_)
|
||||
return asio::post(exec,
|
||||
asio::append(std::move(h),
|
||||
detail::coro_error<error_type>::invalid(), result_type{}));
|
||||
|
||||
auto ch =
|
||||
- detail::coroutine_handle<promise_type>::from_promise(*coro);
|
||||
+ detail::coroutine_handle<promise_type>::from_promise(*coro_promise_);
|
||||
if (!ch)
|
||||
return asio::post(exec,
|
||||
asio::append(std::move(h),
|
||||
@@ -1165,9 +1165,9 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
detail::coro_error<error_type>::done(), result_type{}));
|
||||
else
|
||||
{
|
||||
- coro->awaited_from = detail::post_coroutine(
|
||||
- exec, std::move(h), coro->error_, coro->result_).handle;
|
||||
- coro->reset_error();
|
||||
+ coro_promise_->awaited_from = detail::post_coroutine(
|
||||
+ exec, std::move(h), coro_promise_->error_, coro_promise_->result_).handle;
|
||||
+ coro_promise_->reset_error();
|
||||
ch.resume();
|
||||
}
|
||||
};
|
||||
@@ -1203,9 +1203,9 @@ struct coro<Yield, Return, Executor, Allocator>::initiate_async_resume
|
||||
[h = handle(exec, std::forward<WaitHandler>(handler),
|
||||
std::integral_constant<bool, is_noexcept>{},
|
||||
std::is_void<result_type>{}),
|
||||
- in = std::forward<Input>(input), coro = coro_]() mutable
|
||||
+ in = std::forward<Input>(input), coro_promise_ = coro_]() mutable
|
||||
{
|
||||
- coro->input_ = std::move(in);
|
||||
+ coro_promise_->input_ = std::move(in);
|
||||
std::move(h)();
|
||||
});
|
||||
}
|
@ -3,10 +3,9 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO chriskohlhoff/asio
|
||||
REF asio-1-28-0
|
||||
SHA512 0d635c40a28b6427e2cb6b9c89ab53dba7d3a237df2279148ca05fa899d6f8039a131929230e5ca1dbc7477be784e3da9a6cb68456cbf194178510621556e467
|
||||
REF asio-1-28-1
|
||||
SHA512 4ba0944b203e18524016de2e21ffa0fa6325414af5f6cff6d02450c15e0d7111cec91f7f125ae78d3b3a6f76c6b2c7155738d1830b3250e98c68b5304328f345
|
||||
HEAD_REF master
|
||||
PATCHES fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313
|
||||
)
|
||||
|
||||
# Always use "ASIO_STANDALONE" to avoid boost dependency
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "asio",
|
||||
"version": "1.28.0",
|
||||
"port-version": 1,
|
||||
"version": "1.28.1",
|
||||
"description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
|
||||
"homepage": "https://github.com/chriskohlhoff/asio",
|
||||
"documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c0b1256bf350481cdba09fb8586852ca0560e024",
|
||||
"version": "1.28.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "726d66784925af6062a5a8f285c76dab2469572f",
|
||||
"version": "1.28.0",
|
||||
|
@ -245,8 +245,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"asio": {
|
||||
"baseline": "1.28.0",
|
||||
"port-version": 1
|
||||
"baseline": "1.28.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"asio-grpc": {
|
||||
"baseline": "2.6.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user