Commit caa6aa6e authored by Dominik Charousset's avatar Dominik Charousset

Avoid implicit conversions (fix GCC build errors)

parent 68e0e638
......@@ -820,8 +820,9 @@ scheduled_actor::urgent_queue& scheduled_actor::get_urgent_queue() {
inbound_path* scheduled_actor::make_inbound_path(stream_manager_ptr mgr,
stream_slots slots,
strong_actor_ptr sender) {
using policy_type = policy::downstream_messages::nested;
auto& qs = mailbox_.queue().queues();
auto res = get<2>(qs).queues().emplace(slots.receiver, nullptr);
auto res = get<2>(qs).queues().emplace(slots.receiver, policy_type{nullptr});
if (!res.second)
return nullptr;
auto path = new inbound_path(std::move(mgr), slots, std::move(sender));
......
......@@ -303,8 +303,8 @@ struct entity {
mbox_queue mbox;
const char* name;
entity(const char* cstr_name)
: mbox(mbox_policy{}, handshake_queue_policy{}, nullptr,
dmsg_queue_policy{}),
: mbox(mbox_policy{}, handshake_queue_policy{},
umsg_queue_policy{nullptr}, dmsg_queue_policy{}),
name(cstr_name) {
// nop
}
......@@ -338,7 +338,7 @@ struct entity {
// Create a new queue in the mailbox for incoming traffic.
get<2>(mbox.queues())
.queues()
.emplace(slot, std::unique_ptr<in>{new in(mgr)});
.emplace(slot, inner_dmsg_queue_policy{std::unique_ptr<in>{new in(mgr)}});
// Acknowledge stream.
sender->enqueue<umsg>(this, id.invert(), umsg::ack_handshake{10});
}
......
......@@ -352,7 +352,9 @@ public:
inbound_path* make_inbound_path(stream_manager_ptr mgr, stream_slots slots,
strong_actor_ptr sender) override {
auto res = get<2>(mbox.queues()).queues().emplace(slots.receiver, nullptr);
using policy_type = policy::downstream_messages::nested;
auto res = get<2>(mbox.queues())
.queues().emplace(slots.receiver, policy_type{nullptr});
if (!res.second)
return nullptr;
auto path = new inbound_path(std::move(mgr), slots, std::move(sender));
......
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