Commit d2bf0a64 authored by Jakob Otto's avatar Jakob Otto

Fix build on MacOS

parent 1127f22a
#define CAF_TEST_NO_MAIN #define CAF_TEST_NO_MAIN
#include "caf/fwd.hpp" #include "incubator-test.hpp"
#include "caf/test/dsl.hpp"
#include "caf/test/unit_test_impl.hpp"
#include "caf/type_id.hpp"
int main(int argc, char** argv) { int main(int argc, char** argv) {
caf::init_global_meta_objects<>(); caf::core::init_global_meta_objects();
caf::init_global_meta_objects<caf::id_block::incubator_test>();
return caf::test::main(argc, argv); return caf::test::main(argc, argv);
} }
#pragma once
#include <vector>
#include "caf/fwd.hpp"
#include "caf/stream.hpp"
#include "caf/test/dsl.hpp"
#include "caf/test/unit_test_impl.hpp"
#include "caf/type_id.hpp"
CAF_BEGIN_TYPE_ID_BLOCK(incubator_test, caf::first_custom_type_id)
CAF_ADD_TYPE_ID(incubator_test, (caf::stream<int>) )
CAF_ADD_TYPE_ID(incubator_test, (std::vector<int>) )
CAF_END_TYPE_ID_BLOCK(incubator_test)
...@@ -75,7 +75,7 @@ TESTEE(container_monitor) { ...@@ -75,7 +75,7 @@ TESTEE(container_monitor) {
struct config : actor_system_config { struct config : actor_system_config {
config() { config() {
init_global_meta_objects<bb_test_type_ids>(); // nop
} }
}; };
......
...@@ -86,7 +86,7 @@ TESTEE(stream_monitor) { ...@@ -86,7 +86,7 @@ TESTEE(stream_monitor) {
struct config : actor_system_config { struct config : actor_system_config {
config() { config() {
init_global_meta_objects<bb_test_type_ids>(); // nop
} }
}; };
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "caf/net/make_endpoint_manager.hpp" #include "caf/net/make_endpoint_manager.hpp"
#include "caf/net/multiplexer.hpp" #include "caf/net/multiplexer.hpp"
#include "caf/net/stream_socket.hpp" #include "caf/net/stream_socket.hpp"
#include "caf/node_id.hpp"
#include "caf/span.hpp" #include "caf/span.hpp"
using namespace caf; using namespace caf;
...@@ -124,7 +125,7 @@ public: ...@@ -124,7 +125,7 @@ public:
template <class Manager> template <class Manager>
void resolve(Manager& mgr, const uri& locator, const actor& listener) { void resolve(Manager& mgr, const uri& locator, const actor& listener) {
actor_id aid = 42; actor_id aid = 42;
auto hid = "0011223344556677889900112233445566778899"; auto hid = string_view("0011223344556677889900112233445566778899");
auto nid = unbox(make_node_id(42, hid)); auto nid = unbox(make_node_id(42, hid));
actor_config cfg; actor_config cfg;
auto p = make_actor<actor_proxy_impl, strong_actor_ptr>(aid, nid, auto p = make_actor<actor_proxy_impl, strong_actor_ptr>(aid, nid,
......
...@@ -106,7 +106,7 @@ public: ...@@ -106,7 +106,7 @@ public:
template <class Parent> template <class Parent>
void resolve(Parent& parent, string_view path, const actor& listener) { void resolve(Parent& parent, string_view path, const actor& listener) {
actor_id aid = 42; actor_id aid = 42;
auto hid = "0011223344556677889900112233445566778899"; auto hid = string_view("0011223344556677889900112233445566778899");
auto nid = unbox(make_node_id(42, hid)); auto nid = unbox(make_node_id(42, hid));
actor_config cfg; actor_config cfg;
endpoint_manager_ptr ptr{&parent.manager()}; endpoint_manager_ptr ptr{&parent.manager()};
......
...@@ -168,7 +168,7 @@ public: ...@@ -168,7 +168,7 @@ public:
template <class Parent> template <class Parent>
void resolve(Parent& parent, string_view path, actor listener) { void resolve(Parent& parent, string_view path, actor listener) {
actor_id aid = 42; actor_id aid = 42;
auto hid = "0011223344556677889900112233445566778899"; auto hid = string_view("0011223344556677889900112233445566778899");
auto nid = unbox(make_node_id(aid, hid)); auto nid = unbox(make_node_id(aid, hid));
actor_config cfg; actor_config cfg;
auto sys = &parent.system(); auto sys = &parent.system();
......
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