Commit 7ae65c39 authored by Dominik Charousset's avatar Dominik Charousset

Fix shadowing of base class member

parent 8be5a792
...@@ -46,7 +46,7 @@ private: ...@@ -46,7 +46,7 @@ private:
void forward_msg(strong_actor_ptr sender, message_id mid, message msg, void forward_msg(strong_actor_ptr sender, message_id mid, message msg,
const forwarding_stack* fwd = nullptr); const forwarding_stack* fwd = nullptr);
mutable detail::shared_spinlock mtx_; mutable detail::shared_spinlock broker_mtx_;
actor broker_; actor broker_;
}; };
......
...@@ -45,7 +45,7 @@ void forwarding_actor_proxy::forward_msg(strong_actor_ptr sender, ...@@ -45,7 +45,7 @@ void forwarding_actor_proxy::forward_msg(strong_actor_ptr sender,
if (msg.match_elements<exit_msg>()) if (msg.match_elements<exit_msg>())
unlink_from(msg.get_as<exit_msg>(0).source); unlink_from(msg.get_as<exit_msg>(0).source);
forwarding_stack tmp; forwarding_stack tmp;
shared_lock<detail::shared_spinlock> guard(mtx_); shared_lock<detail::shared_spinlock> guard(broker_mtx_);
if (broker_) if (broker_)
broker_->enqueue(nullptr, invalid_message_id, broker_->enqueue(nullptr, invalid_message_id,
make_message(forward_atom::value, std::move(sender), make_message(forward_atom::value, std::move(sender),
...@@ -85,7 +85,7 @@ void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) { ...@@ -85,7 +85,7 @@ void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) {
CAF_ASSERT(ctx != nullptr); CAF_ASSERT(ctx != nullptr);
actor tmp; actor tmp;
{ // lifetime scope of guard { // lifetime scope of guard
std::unique_lock<detail::shared_spinlock> guard(mtx_); std::unique_lock<detail::shared_spinlock> guard(broker_mtx_);
broker_.swap(tmp); // manually break cycle broker_.swap(tmp); // manually break cycle
} }
cleanup(std::move(rsn), ctx); cleanup(std::move(rsn), ctx);
......
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