Commit bc092fb3 authored by Marian Triebe's avatar Marian Triebe

Merge branch 'master' into topic/opencl

parents f10b5aee 37c4ed35
......@@ -118,7 +118,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
};
}
void enqueue(const message_header& hdr, any_tuple msg) override {
void enqueue(msg_hdr_cref hdr, any_tuple msg, execution_unit*) override {
CPPA_LOG_TRACE("");
typename util::il_indices<util::type_list<Args...>>::type indices;
enqueue_impl(hdr.sender, std::move(msg), hdr.id, indices);
......
......@@ -97,7 +97,9 @@ void opencl_metainfo::initialize()
const void *,
size_t,
void *) {
CPPA_LOG_ERROR("\n##### Error message via pfn_notify #####\n" +
CPPA_LOGC_ERROR("cppa::opencl::opencl_metainfo",
"initialize",
"\n##### Error message via pfn_notify #####\n" +
string(errinfo) +
"\n########################################");
};
......
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