Commit 4b1b1ad5 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'develop'

parents 5a43b082 66a3ec4f
...@@ -63,6 +63,8 @@ class actor_companion : public abstract_event_based_actor<behavior, true> { ...@@ -63,6 +63,8 @@ class actor_companion : public abstract_event_based_actor<behavior, true> {
void enqueue(const actor_addr& sender, message_id mid, void enqueue(const actor_addr& sender, message_id mid,
message content, execution_unit* host) override; message content, execution_unit* host) override;
void initialize();
private: private:
// set by parent to define custom enqueue action // set by parent to define custom enqueue action
enqueue_handler m_on_enqueue; enqueue_handler m_on_enqueue;
......
...@@ -71,9 +71,9 @@ class actor_widget : public Base { ...@@ -71,9 +71,9 @@ class actor_widget : public Base {
if (event->type() == static_cast<QEvent::Type>(EventId)) { if (event->type() == static_cast<QEvent::Type>(EventId)) {
auto ptr = dynamic_cast<event_type*>(event); auto ptr = dynamic_cast<event_type*>(event);
if (ptr) { if (ptr) {
m_invoke.invoke_message(m_companion.get(), ptr->mptr, m_companion->invoke_message(ptr->mptr,
m_companion->bhvr_stack().back(), m_companion->get_behavior(),
m_companion->bhvr_stack().back_id()); m_companion->awaited_response_id());
return true; return true;
} }
} }
......
...@@ -50,4 +50,8 @@ void actor_companion::enqueue(const actor_addr& sender, message_id mid, ...@@ -50,4 +50,8 @@ void actor_companion::enqueue(const actor_addr& sender, message_id mid,
enqueue(std::move(ptr), eu); enqueue(std::move(ptr), eu);
} }
void actor_companion::initialize() {
// nop
}
} // namespace caf } // namespace caf
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