Unverified Commit 8b28db8d authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #89

Fix warnings
parents 5c319ff6 792fd127
......@@ -50,7 +50,7 @@ if(CAF_INC_ENABLE_STANDALONE_BUILD)
FetchContent_Declare(
actor_framework
GIT_REPOSITORY https://github.com/actor-framework/actor-framework.git
GIT_TAG 4f8609b
GIT_TAG 6b2cbd4
)
FetchContent_Populate(actor_framework)
set(CAF_ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE)
......@@ -66,6 +66,7 @@ else()
endif()
# -- set the library version for shared library targets ------------------------
if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
set(CAF_LIB_VERSION "${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}"
CACHE INTERNAL "The version string used for shared library objects")
......
......@@ -194,7 +194,7 @@ public:
}
caf::config_value_reader reader{&val};
caf::message msg;
if (!reader.apply_object(msg)) {
if (!reader.apply(msg)) {
down->abort_reason(reader.get_error());
return -1;
}
......
......@@ -39,7 +39,8 @@ public:
std::vector<strong_actor_ptr> fwd_stack;
message content;
binary_deserializer source{ctx, payload};
if (!source.apply_objects(src_node, src_id, dst_id, fwd_stack, content)) {
if (!(source.apply(src_node) && source.apply(src_id) && source.apply(dst_id)
&& source.apply(fwd_stack) && source.apply(content))) {
CAF_LOG_ERROR(
"failed to deserialize payload:" << CAF_ARG(source.get_error()));
return;
......
......@@ -47,7 +47,7 @@ public:
///
/// @param sock An accept socket in listening mode. For a TCP socket, this
/// socket must already listen to an address plus port.
/// @param factory
/// @param factory An application stack factory.
template <class Socket, class Factory>
auto make_acceptor(Socket sock, Factory factory) {
using connected_socket_type = typename Socket::connected_socket_type;
......
......@@ -21,7 +21,7 @@ CAF_TEST(serialization) {
byte_buffer buf;
{
binary_serializer sink{nullptr, buf};
CAF_CHECK(sink.apply_object(x));
CAF_CHECK(sink.apply(x));
}
CAF_CHECK_EQUAL(buf.size(), basp::header_size);
auto buf2 = to_bytes(x);
......@@ -30,7 +30,7 @@ CAF_TEST(serialization) {
basp::header y;
{
binary_deserializer source{nullptr, buf};
CAF_CHECK(source.apply_object(y));
CAF_CHECK(source.apply(y));
}
CAF_CHECK_EQUAL(x, y);
auto z = basp::header::from_bytes(buf);
......
......@@ -100,7 +100,7 @@ struct app_t {
// Deserialize message from received dictionary.
config_value_reader reader{&val};
caf::message msg;
if (!reader.apply_object(msg)) {
if (!reader.apply(msg)) {
down->abort_reason(reader.get_error());
return -1;
}
......
......@@ -73,7 +73,7 @@ struct ll_provide_stream_for_messages {
}
void run() {
CAF_CHECK(data_stream.size() != 0);
CAF_CHECK(!data_stream.empty());
while (processed != data_stream.size()) {
auto all_data = make_span(data_stream.data() + processed,
data_stream.size() - processed);
......@@ -90,7 +90,7 @@ struct ll_provide_stream_for_messages {
offered -= processed;
processed = 0;
}
if (consumed == 0 || data_stream.size() == 0)
if (consumed == 0 || data_stream.empty())
return;
}
}
......@@ -107,7 +107,7 @@ template <class... Ts>
byte_buffer to_buf(const Ts&... xs) {
byte_buffer buf;
binary_serializer sink{nullptr, buf};
if (!sink.apply_objects(xs...))
if (!(sink.apply(xs) && ...))
CAF_FAIL("to_buf failed: " << sink.get_error());
return buf;
}
......
......@@ -103,7 +103,7 @@ struct app_t {
// Deserialize message from received dictionary.
config_value_reader reader{&val};
caf::message msg;
if (!reader.apply_object(msg)) {
if (!reader.apply(msg)) {
down->abort_reason(reader.get_error());
return -1;
}
......
......@@ -183,7 +183,8 @@ CAF_TEST(handshakes may arrive in chunks) {
CAF_CHECK_EQUAL(transport.handle_input(), 0u);
CAF_CHECK(!ws->handshake_complete());
transport.push(bufs[2]);
CAF_CHECK_EQUAL(transport.handle_input(), opening_handshake.size());
CAF_CHECK_EQUAL(static_cast<size_t>(transport.handle_input()),
opening_handshake.size());
CAF_CHECK(ws->handshake_complete());
}
......
......@@ -25,8 +25,10 @@ CAF_TEST(send and receive) {
pipe_socket rd_sock;
pipe_socket wr_sock;
std::tie(rd_sock, wr_sock) = unbox(make_pipe());
CAF_CHECK_EQUAL(write(wr_sock, send_buf), send_buf.size());
CAF_CHECK_EQUAL(read(rd_sock, receive_buf), send_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(write(wr_sock, send_buf)),
send_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(read(rd_sock, receive_buf)),
send_buf.size());
CAF_CHECK(std::equal(send_buf.begin(), send_buf.end(), receive_buf.begin()));
}
......
......@@ -70,16 +70,16 @@ CAF_TEST(read on empty sockets) {
CAF_TEST(transfer data from first to second socket) {
byte_buffer wr_buf{1_b, 2_b, 4_b, 8_b, 16_b, 32_b, 64_b};
CAF_MESSAGE("transfer data from first to second socket");
CAF_CHECK_EQUAL(write(first, wr_buf), wr_buf.size());
CAF_CHECK_EQUAL(read(second, rd_buf), wr_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(write(first, wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(read(second, rd_buf)), wr_buf.size());
CAF_CHECK(std::equal(wr_buf.begin(), wr_buf.end(), rd_buf.begin()));
rd_buf.assign(rd_buf.size(), byte(0));
}
CAF_TEST(transfer data from second to first socket) {
byte_buffer wr_buf{1_b, 2_b, 4_b, 8_b, 16_b, 32_b, 64_b};
CAF_CHECK_EQUAL(write(second, wr_buf), wr_buf.size());
CAF_CHECK_EQUAL(read(first, rd_buf), wr_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(write(second, wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(read(first, rd_buf)), wr_buf.size());
CAF_CHECK(std::equal(wr_buf.begin(), wr_buf.end(), rd_buf.begin()));
}
......@@ -95,9 +95,10 @@ CAF_TEST(transfer data using multiple buffers) {
byte_buffer full_buf;
full_buf.insert(full_buf.end(), wr_buf_1.begin(), wr_buf_1.end());
full_buf.insert(full_buf.end(), wr_buf_2.begin(), wr_buf_2.end());
CAF_CHECK_EQUAL(write(second, {make_span(wr_buf_1), make_span(wr_buf_2)}),
CAF_CHECK_EQUAL(static_cast<size_t>(
write(second, {make_span(wr_buf_1), make_span(wr_buf_2)})),
full_buf.size());
CAF_CHECK_EQUAL(read(first, rd_buf), full_buf.size());
CAF_CHECK_EQUAL(static_cast<size_t>(read(first, rd_buf)), full_buf.size());
CAF_CHECK(std::equal(full_buf.begin(), full_buf.end(), rd_buf.begin()));
}
......
......@@ -119,7 +119,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
header hdr{hello_test.size()};
byte_buffer hdr_buf;
binary_serializer sink(sys, hdr_buf);
if (!sink.apply_object(hdr))
if (!sink.apply(hdr))
CAF_FAIL("failed to serialize payload: " << sink.get_error());
auto bytes = as_bytes(make_span(hello_test));
byte_buffer payload_buf(bytes.begin(), bytes.end());
......@@ -134,7 +134,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
CAF_CHECK_EQUAL(buf.size(), packet_size);
binary_deserializer source(nullptr, buf);
header recv_hdr;
if (!source.apply_objects(recv_hdr))
if (!source.apply(recv_hdr))
CAF_FAIL("failed to deserialize header: " << source.get_error());
CAF_CHECK_EQUAL(hdr.payload_size, recv_hdr.payload_size);
string_view received{reinterpret_cast<const char*>(buf.data())
......
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