Commit 78c60326 authored by Jakob Otto's avatar Jakob Otto

Fix warnings

parent fdc00758
...@@ -66,6 +66,7 @@ else() ...@@ -66,6 +66,7 @@ else()
endif() endif()
# -- set the library version for shared library targets ------------------------ # -- set the library version for shared library targets ------------------------
if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD") if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
set(CAF_LIB_VERSION "${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}" set(CAF_LIB_VERSION "${CAF_VERSION_MAJOR}.${CAF_VERSION_MINOR}"
CACHE INTERNAL "The version string used for shared library objects") CACHE INTERNAL "The version string used for shared library objects")
......
...@@ -194,7 +194,7 @@ public: ...@@ -194,7 +194,7 @@ public:
} }
caf::config_value_reader reader{&val}; caf::config_value_reader reader{&val};
caf::message msg; caf::message msg;
if (!reader.apply_object(msg)) { if (!reader.apply(msg)) {
down->abort_reason(reader.get_error()); down->abort_reason(reader.get_error());
return -1; return -1;
} }
......
...@@ -53,7 +53,8 @@ public: ...@@ -53,7 +53,8 @@ public:
std::vector<strong_actor_ptr> fwd_stack; std::vector<strong_actor_ptr> fwd_stack;
message content; message content;
binary_deserializer source{ctx, payload}; 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( CAF_LOG_ERROR(
"failed to deserialize payload:" << CAF_ARG(source.get_error())); "failed to deserialize payload:" << CAF_ARG(source.get_error()));
return; return;
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
/// ///
/// @param sock An accept socket in listening mode. For a TCP socket, this /// @param sock An accept socket in listening mode. For a TCP socket, this
/// socket must already listen to an address plus port. /// socket must already listen to an address plus port.
/// @param factory /// @param factory An application stack factory.
template <class Socket, class Factory> template <class Socket, class Factory>
auto make_acceptor(Socket sock, Factory factory) { auto make_acceptor(Socket sock, Factory factory) {
using connected_socket_type = typename Socket::connected_socket_type; using connected_socket_type = typename Socket::connected_socket_type;
......
...@@ -35,7 +35,7 @@ CAF_TEST(serialization) { ...@@ -35,7 +35,7 @@ CAF_TEST(serialization) {
byte_buffer buf; byte_buffer buf;
{ {
binary_serializer sink{nullptr, 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); CAF_CHECK_EQUAL(buf.size(), basp::header_size);
auto buf2 = to_bytes(x); auto buf2 = to_bytes(x);
...@@ -44,7 +44,7 @@ CAF_TEST(serialization) { ...@@ -44,7 +44,7 @@ CAF_TEST(serialization) {
basp::header y; basp::header y;
{ {
binary_deserializer source{nullptr, buf}; binary_deserializer source{nullptr, buf};
CAF_CHECK(source.apply_object(y)); CAF_CHECK(source.apply(y));
} }
CAF_CHECK_EQUAL(x, y); CAF_CHECK_EQUAL(x, y);
auto z = basp::header::from_bytes(buf); auto z = basp::header::from_bytes(buf);
......
...@@ -114,7 +114,7 @@ struct app_t { ...@@ -114,7 +114,7 @@ struct app_t {
// Deserialize message from received dictionary. // Deserialize message from received dictionary.
config_value_reader reader{&val}; config_value_reader reader{&val};
caf::message msg; caf::message msg;
if (!reader.apply_object(msg)) { if (!reader.apply(msg)) {
down->abort_reason(reader.get_error()); down->abort_reason(reader.get_error());
return -1; return -1;
} }
......
...@@ -87,7 +87,7 @@ struct ll_provide_stream_for_messages { ...@@ -87,7 +87,7 @@ struct ll_provide_stream_for_messages {
} }
void run() { void run() {
CAF_CHECK(data_stream.size() != 0); CAF_CHECK(!data_stream.empty());
while (processed != data_stream.size()) { while (processed != data_stream.size()) {
auto all_data = make_span(data_stream.data() + processed, auto all_data = make_span(data_stream.data() + processed,
data_stream.size() - processed); data_stream.size() - processed);
...@@ -104,7 +104,7 @@ struct ll_provide_stream_for_messages { ...@@ -104,7 +104,7 @@ struct ll_provide_stream_for_messages {
offered -= processed; offered -= processed;
processed = 0; processed = 0;
} }
if (consumed == 0 || data_stream.size() == 0) if (consumed == 0 || data_stream.empty())
return; return;
} }
} }
...@@ -121,7 +121,7 @@ template <class... Ts> ...@@ -121,7 +121,7 @@ template <class... Ts>
byte_buffer to_buf(const Ts&... xs) { byte_buffer to_buf(const Ts&... xs) {
byte_buffer buf; byte_buffer buf;
binary_serializer sink{nullptr, buf}; binary_serializer sink{nullptr, buf};
if (!sink.apply_objects(xs...)) if (!(sink.apply(xs) && ...))
CAF_FAIL("to_buf failed: " << sink.get_error()); CAF_FAIL("to_buf failed: " << sink.get_error());
return buf; return buf;
} }
......
...@@ -117,7 +117,7 @@ struct app_t { ...@@ -117,7 +117,7 @@ struct app_t {
// Deserialize message from received dictionary. // Deserialize message from received dictionary.
config_value_reader reader{&val}; config_value_reader reader{&val};
caf::message msg; caf::message msg;
if (!reader.apply_object(msg)) { if (!reader.apply(msg)) {
down->abort_reason(reader.get_error()); down->abort_reason(reader.get_error());
return -1; return -1;
} }
......
...@@ -197,7 +197,8 @@ CAF_TEST(handshakes may arrive in chunks) { ...@@ -197,7 +197,8 @@ CAF_TEST(handshakes may arrive in chunks) {
CAF_CHECK_EQUAL(transport.handle_input(), 0u); CAF_CHECK_EQUAL(transport.handle_input(), 0u);
CAF_CHECK(!ws->handshake_complete()); CAF_CHECK(!ws->handshake_complete());
transport.push(bufs[2]); 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()); CAF_CHECK(ws->handshake_complete());
} }
......
...@@ -39,8 +39,10 @@ CAF_TEST(send and receive) { ...@@ -39,8 +39,10 @@ CAF_TEST(send and receive) {
pipe_socket rd_sock; pipe_socket rd_sock;
pipe_socket wr_sock; pipe_socket wr_sock;
std::tie(rd_sock, wr_sock) = unbox(make_pipe()); std::tie(rd_sock, wr_sock) = unbox(make_pipe());
CAF_CHECK_EQUAL(write(wr_sock, send_buf), send_buf.size()); CAF_CHECK_EQUAL(static_cast<size_t>(write(wr_sock, send_buf)),
CAF_CHECK_EQUAL(read(rd_sock, receive_buf), send_buf.size()); 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())); CAF_CHECK(std::equal(send_buf.begin(), send_buf.end(), receive_buf.begin()));
} }
......
...@@ -84,16 +84,16 @@ CAF_TEST(read on empty sockets) { ...@@ -84,16 +84,16 @@ CAF_TEST(read on empty sockets) {
CAF_TEST(transfer data from first to second socket) { 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}; 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_MESSAGE("transfer data from first to second socket");
CAF_CHECK_EQUAL(write(first, wr_buf), wr_buf.size()); CAF_CHECK_EQUAL(static_cast<size_t>(write(first, wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(read(second, rd_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())); CAF_CHECK(std::equal(wr_buf.begin(), wr_buf.end(), rd_buf.begin()));
rd_buf.assign(rd_buf.size(), byte(0)); rd_buf.assign(rd_buf.size(), byte(0));
} }
CAF_TEST(transfer data from second to first socket) { 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}; 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(static_cast<size_t>(write(second, wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(read(first, rd_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())); CAF_CHECK(std::equal(wr_buf.begin(), wr_buf.end(), rd_buf.begin()));
} }
...@@ -109,9 +109,10 @@ CAF_TEST(transfer data using multiple buffers) { ...@@ -109,9 +109,10 @@ CAF_TEST(transfer data using multiple buffers) {
byte_buffer full_buf; 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_1.begin(), wr_buf_1.end());
full_buf.insert(full_buf.end(), wr_buf_2.begin(), wr_buf_2.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()); 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())); CAF_CHECK(std::equal(full_buf.begin(), full_buf.end(), rd_buf.begin()));
} }
......
...@@ -133,7 +133,7 @@ CAF_TEST(read / write using span<byte_buffer*>) { ...@@ -133,7 +133,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
header hdr{hello_test.size()}; header hdr{hello_test.size()};
byte_buffer hdr_buf; byte_buffer hdr_buf;
binary_serializer sink(sys, 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()); CAF_FAIL("failed to serialize payload: " << sink.get_error());
auto bytes = as_bytes(make_span(hello_test)); auto bytes = as_bytes(make_span(hello_test));
byte_buffer payload_buf(bytes.begin(), bytes.end()); byte_buffer payload_buf(bytes.begin(), bytes.end());
...@@ -148,7 +148,7 @@ CAF_TEST(read / write using span<byte_buffer*>) { ...@@ -148,7 +148,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
CAF_CHECK_EQUAL(buf.size(), packet_size); CAF_CHECK_EQUAL(buf.size(), packet_size);
binary_deserializer source(nullptr, buf); binary_deserializer source(nullptr, buf);
header recv_hdr; header recv_hdr;
if (!source.apply_objects(recv_hdr)) if (!source.apply(recv_hdr))
CAF_FAIL("failed to deserialize header: " << source.get_error()); CAF_FAIL("failed to deserialize header: " << source.get_error());
CAF_CHECK_EQUAL(hdr.payload_size, recv_hdr.payload_size); CAF_CHECK_EQUAL(hdr.payload_size, recv_hdr.payload_size);
string_view received{reinterpret_cast<const char*>(buf.data()) 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