From eb4194633670f8813094aa87eba54b07d5453196 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 1 Dec 2018 13:01:36 +0100 Subject: wanda: remove boost asio and program_options --- src/control_interface.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/control_interface.cpp') diff --git a/src/control_interface.cpp b/src/control_interface.cpp index a3ecdb8..b8ca58e 100644 --- a/src/control_interface.cpp +++ b/src/control_interface.cpp @@ -1,7 +1,5 @@ #include "control_interface.hpp" -#include - #include #include @@ -9,6 +7,7 @@ #include #include #include +#include #include namespace wanda @@ -26,7 +25,7 @@ socket_deleter::~socket_deleter() // 'control_interface' implementation -control_interface::control_interface(control_interface::key key, boost::asio::io_service &service, control_interface::protocol::endpoint endpoint, std::shared_ptr logger) +control_interface::control_interface(control_interface::key key, asio::io_service &service, control_interface::protocol::endpoint endpoint, std::shared_ptr logger) : keyed{key}, m_service{service}, m_endpoint{std::move(endpoint)}, @@ -36,19 +35,19 @@ control_interface::control_interface(control_interface::key key, boost::asio::io { } -boost::system::error_code control_interface::start() +std::error_code control_interface::start() { - if (auto error = boost::system::error_code{}; m_acceptor.open(m_endpoint.protocol(), error)) + if (auto error = std::error_code{}; m_acceptor.open(m_endpoint.protocol(), error)) { return error; } - if (auto error = boost::system::error_code{}; m_acceptor.bind(m_endpoint, error)) + if (auto error = std::error_code{}; m_acceptor.bind(m_endpoint, error)) { return error; } - if (auto error = boost::system::error_code{}; m_acceptor.listen(128, error)) + if (auto error = std::error_code{}; m_acceptor.listen(128, error)) { return error; } @@ -59,21 +58,21 @@ boost::system::error_code control_interface::start() } } -boost::system::error_code control_interface::shutdown() +std::error_code control_interface::shutdown() { for (auto &connection : m_connections) { connection->close(); } - auto error = boost::system::error_code{}; + auto error = std::error_code{}; return m_acceptor.close(error); } void control_interface::perform_accept() { m_acceptor.async_accept(m_socket, [that = shared_from_this(), this](auto const &error) { - if (error && error != boost::asio::error::operation_aborted) + if (error && error != asio::error::operation_aborted) { m_logger->error("failed to accept connection because '{}'", error); } @@ -134,7 +133,7 @@ void control_interface::on_received(control_connection::pointer connection, mess } } -control_interface::pointer make_interface(boost::asio::io_service &service, std::filesystem::path file, std::shared_ptr logger) +control_interface::pointer make_interface(asio::io_service &service, std::filesystem::path file, std::shared_ptr logger) { if (std::filesystem::exists(file)) { -- cgit v1.2.3