Commit 28415141 authored by Jakob Otto's avatar Jakob Otto

Add missing changes for PR

parent b09edcb0
......@@ -22,12 +22,10 @@
#include <system_error>
#include <utility>
#include "caf/byte.hpp"
#include "caf/fwd.hpp"
#include "caf/net/abstract_socket.hpp"
#include "caf/net/socket.hpp"
#include "caf/net/socket_id.hpp"
#include "caf/span.hpp"
namespace caf {
namespace net {
......
......@@ -18,10 +18,8 @@
#pragma once
#include "caf/byte.hpp"
#include "caf/fwd.hpp"
#include "caf/net/network_socket.hpp"
#include "caf/span.hpp"
namespace caf {
namespace net {
......
......@@ -92,7 +92,7 @@ public:
auto len = write_buf_.size() - written_;
auto buf = write_buf_.data() + written_;
CAF_LOG_TRACE(CAF_ARG(handle_.id) << CAF_ARG(len));
auto ret = net::write(handle_, as_bytes(make_span(buf, len)));
auto ret = net::write(handle_, make_span(buf, len));
if (auto num_bytes = get_if<size_t>(&ret)) {
CAF_LOG_DEBUG(CAF_ARG(len) << CAF_ARG(handle_.id) << CAF_ARG(*num_bytes));
// Update state.
......
......@@ -106,7 +106,7 @@ public:
auto& payload = x->payload;
write_buf_.insert(write_buf_.end(), payload.begin(), payload.end());
}
auto res = write(handle_, as_bytes(make_span(write_buf_)));
auto res = write(handle_, make_span(write_buf_));
if (auto num_bytes = get_if<size_t>(&res)) {
write_buf_.erase(write_buf_.begin(), write_buf_.begin() + *num_bytes);
return write_buf_.size() > 0;
......
......@@ -73,7 +73,7 @@ public:
bool handle_write_event() override {
if (wr_buf_.size() == 0)
return false;
auto res = write(handle(), as_bytes(make_span(wr_buf_)));
auto res = write(handle(), make_span(wr_buf_));
if (auto num_bytes = get_if<size_t>(&res)) {
CAF_ASSERT(*num_bytes > 0);
wr_buf_.erase(wr_buf_.begin(), wr_buf_.begin() + *num_bytes);
......
......@@ -42,8 +42,7 @@ 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, as_bytes(make_span(send_buf))),
send_buf.size());
CAF_CHECK_EQUAL(write(wr_sock, make_span(send_buf)), send_buf.size());
CAF_CHECK_EQUAL(read(rd_sock, make_span(receive_buf)), send_buf.size());
CAF_CHECK(std::equal(send_buf.begin(), send_buf.end(), receive_buf.begin()));
}
......
......@@ -55,12 +55,12 @@ CAF_TEST(connected socket pair) {
CAF_CHECK_EQUAL(read(x.second, make_span(rd_buf)),
sec::unavailable_or_would_block);
CAF_MESSAGE("transfer data from first to second socket");
CAF_CHECK_EQUAL(write(x.first, as_bytes(make_span(wr_buf))), wr_buf.size());
CAF_CHECK_EQUAL(write(x.first, make_span(wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(read(x.second, make_span(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_MESSAGE("transfer data from second to first socket");
CAF_CHECK_EQUAL(write(x.second, as_bytes(make_span(wr_buf))), wr_buf.size());
CAF_CHECK_EQUAL(write(x.second, make_span(wr_buf)), wr_buf.size());
CAF_CHECK_EQUAL(read(x.first, make_span(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));
......
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