Skip to content

Commit 6cbe56e

Browse files
committed
refactor, moveonly: order lambda move captures first
Followup for #88
1 parent 1f76880 commit 6cbe56e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

include/mp/proxy-io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class Connection
312312
// to the EventLoop TaskSet to avoid "Promise callback destroyed itself"
313313
// error in cases where f deletes this Connection object.
314314
m_on_disconnect.add(m_network.onDisconnect().then(
315-
[this, f = std::move(f)]() mutable { m_loop.m_task_set->add(kj::evalLater(kj::mv(f))); }));
315+
[f = std::move(f), this]() mutable { m_loop.m_task_set->add(kj::evalLater(kj::mv(f))); }));
316316
}
317317

318318
EventLoop& m_loop;

include/mp/proxy-types.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ auto PassField(Priority<1>, TypeList<>, ServerContext& server_context, const Fn&
112112
auto& server = server_context.proxy_server;
113113
int req = server_context.req;
114114
auto invoke = MakeAsyncCallable(
115-
[&server, req, fn, args...,
116-
fulfiller = kj::mv(future.fulfiller),
117-
call_context = kj::mv(server_context.call_context)]() mutable {
115+
[fulfiller = kj::mv(future.fulfiller),
116+
call_context = kj::mv(server_context.call_context), &server, req, fn, args...]() mutable {
118117
const auto& params = call_context.getParams();
119118
Context::Reader context_arg = Accessor::get(params);
120119
ServerContext server_context{server, call_context, req};

0 commit comments

Comments
 (0)