Commit 0ff9ba2a authored by Dominik Charousset's avatar Dominik Charousset

Fix shadowing warnings

parent 8d539514
...@@ -321,8 +321,8 @@ struct config_value_access<std::vector<T>> { ...@@ -321,8 +321,8 @@ struct config_value_access<std::vector<T>> {
static bool is(const config_value& x) { static bool is(const config_value& x) {
auto lst = caf::get_if<config_value::list>(&x); auto lst = caf::get_if<config_value::list>(&x);
if (lst != nullptr) { if (lst != nullptr) {
return std::all_of(lst->begin(), lst->end(), [](const config_value& x) { return std::all_of(lst->begin(), lst->end(), [](const config_value& y) {
return caf::holds_alternative<T>(x); return caf::holds_alternative<T>(y);
}); });
} }
return false; return false;
...@@ -366,8 +366,8 @@ struct config_value_access<dictionary<V>> { ...@@ -366,8 +366,8 @@ struct config_value_access<dictionary<V>> {
static bool is(const config_value& x) { static bool is(const config_value& x) {
auto lst = caf::get_if<config_value::dictionary>(&x); auto lst = caf::get_if<config_value::dictionary>(&x);
if (lst != nullptr) { if (lst != nullptr) {
return std::all_of(lst->begin(), lst->end(), [](const kvp& x) { return std::all_of(lst->begin(), lst->end(), [](const kvp& y) {
return holds_alternative<V>(x.second); return holds_alternative<V>(y.second);
}); });
} }
return false; return false;
......
...@@ -467,8 +467,8 @@ uint64_t scheduled_actor::set_stream_timeout(actor_clock::time_point x) { ...@@ -467,8 +467,8 @@ uint64_t scheduled_actor::set_stream_timeout(actor_clock::time_point x) {
mgrs.emplace_back(kvp.second); mgrs.emplace_back(kvp.second);
std::sort(mgrs.begin(), mgrs.end()); std::sort(mgrs.begin(), mgrs.end());
auto e = std::unique(mgrs.begin(), mgrs.end()); auto e = std::unique(mgrs.begin(), mgrs.end());
auto idle = [=](const stream_manager_ptr& x) { auto idle = [=](const stream_manager_ptr& y) {
return x->idle(); return y->idle();
}; };
if (std::all_of(mgrs.begin(), e, idle)) { if (std::all_of(mgrs.begin(), e, idle)) {
CAF_LOG_DEBUG("suppress stream timeout"); CAF_LOG_DEBUG("suppress stream timeout");
...@@ -1029,10 +1029,10 @@ scheduled_actor::handle_open_stream_msg(mailbox_element& x) { ...@@ -1029,10 +1029,10 @@ scheduled_actor::handle_open_stream_msg(mailbox_element& x) {
auto& osm = x.content().get_mutable_as<open_stream_msg>(0); auto& osm = x.content().get_mutable_as<open_stream_msg>(0);
visitor f; visitor f;
// Utility lambda for aborting the stream on error. // Utility lambda for aborting the stream on error.
auto fail = [&](sec x, const char* reason) { auto fail = [&](sec y, const char* reason) {
stream_slots path_id{osm.slot, 0}; stream_slots path_id{osm.slot, 0};
inbound_path::emit_irregular_shutdown(this, path_id, osm.prev_stage, inbound_path::emit_irregular_shutdown(this, path_id, osm.prev_stage,
make_error(x, reason)); make_error(y, reason));
auto rp = make_response_promise(); auto rp = make_response_promise();
rp.deliver(sec::stream_init_failed); rp.deliver(sec::stream_init_failed);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment