Commit a8c30ef2 authored by Marian Triebe's avatar Marian Triebe

Fix compile and warnings

parent 87976c8e
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <stdexcept> #include <stdexcept>
#include "caf/locks.hpp" #include "caf/locks.hpp"
#include "caf/actor_cast.hpp"
#include "caf/attachable.hpp" #include "caf/attachable.hpp"
#include "caf/exit_reason.hpp" #include "caf/exit_reason.hpp"
......
...@@ -313,9 +313,10 @@ protected: ...@@ -313,9 +313,10 @@ protected:
private: private:
doorman_map doormen_; doorman_map doormen_;
scribe_map scribes_;
middleman& mm_; middleman& mm_;
detail::intrusive_partitioned_list<mailbox_element, detail::disposer> cache_; detail::intrusive_partitioned_list<mailbox_element, detail::disposer> cache_;
protected:
scribe_map scribes_;
}; };
} // namespace io } // namespace io
......
...@@ -184,7 +184,6 @@ connection_state instance::handle(const new_data_msg& dm, header& hdr, ...@@ -184,7 +184,6 @@ connection_state instance::handle(const new_data_msg& dm, header& hdr,
CAF_LOG_TRACE(""); CAF_LOG_TRACE("");
// function object providing cleanup code on errors // function object providing cleanup code on errors
auto err = [&]() -> connection_state { auto err = [&]() -> connection_state {
using erase_cb = routing_table::erase_callback;
auto cb = make_callback([&](const node_id& nid){ auto cb = make_callback([&](const node_id& nid){
callee_.purge_state(nid); callee_.purge_state(nid);
}); });
...@@ -388,7 +387,6 @@ connection_state instance::handle(const new_data_msg& dm, header& hdr, ...@@ -388,7 +387,6 @@ connection_state instance::handle(const new_data_msg& dm, header& hdr,
} }
void instance::handle(const connection_closed_msg& msg) { void instance::handle(const connection_closed_msg& msg) {
using erase_cb = routing_table::erase_callback;
auto cb = make_callback([&](const node_id& nid){ auto cb = make_callback([&](const node_id& nid){
callee_.purge_state(nid); callee_.purge_state(nid);
}); });
...@@ -400,7 +398,6 @@ void instance::handle_node_shutdown(const node_id& affected_node) { ...@@ -400,7 +398,6 @@ void instance::handle_node_shutdown(const node_id& affected_node) {
if (affected_node == invalid_node_id) if (affected_node == invalid_node_id)
return; return;
CAF_LOG_INFO("lost direct connection to " << to_string(affected_node)); CAF_LOG_INFO("lost direct connection to " << to_string(affected_node));
using erase_cb = routing_table::erase_callback;
auto cb = make_callback([&](const node_id& nid){ auto cb = make_callback([&](const node_id& nid){
callee_.purge_state(nid); callee_.purge_state(nid);
}); });
......
...@@ -241,7 +241,12 @@ void basp_broker_state::set_context(connection_handle hdl) { ...@@ -241,7 +241,12 @@ void basp_broker_state::set_context(connection_handle hdl) {
auto i = ctx.find(hdl); auto i = ctx.find(hdl);
if (i == ctx.end()) { if (i == ctx.end()) {
CAF_LOG_INFO("create new BASP context for handle " << hdl.id()); CAF_LOG_INFO("create new BASP context for handle " << hdl.id());
i = ctx.emplace(hdl, connection_context{basp::await_header, basp::header{}, i = ctx.emplace(hdl, connection_context{basp::await_header,
basp::header{invalid_node_id,
invalid_node_id,
invalid_actor_id,
invalid_actor_id,
0, 0, 0},
hdl, invalid_node_id, 0, none, {}}) hdl, invalid_node_id, 0, none, {}})
.first; .first;
} }
......
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