diff options
| author | Thomas Habets <thomas@habets.se> | 2020-08-11 12:04:14 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-14 04:19:58 -0700 |
| commit | 4b8725982361f66304e53391c1411de1d5840bff (patch) | |
| tree | 7b281388533018ec50f918f34ee12480b5de910f | |
| parent | 048e5b1ec1261422e1856f982ba97b4c371b3eb0 (diff) | |
blocks/socket_pdu: Remove manual memory management
| -rw-r--r-- | gr-blocks/lib/socket_pdu_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index 60c1a90b38..f30e944d7b 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -82,8 +82,8 @@ socket_pdu_impl::socket_pdu_impl(std::string type, } if (type == "TCP_SERVER") { - d_acceptor_tcp.reset( - new boost::asio::ip::tcp::acceptor(d_io_service, d_tcp_endpoint)); + d_acceptor_tcp = std::make_shared<boost::asio::ip::tcp::acceptor>(d_io_service, + d_tcp_endpoint); d_acceptor_tcp->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); start_tcp_accept(); @@ -92,7 +92,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type, [this](pmt::pmt_t msg) { this->tcp_server_send(msg); }); } else if (type == "TCP_CLIENT") { boost::system::error_code error = boost::asio::error::host_not_found; - d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); + d_tcp_socket = std::make_shared<boost::asio::ip::tcp::socket>(d_io_service); d_tcp_socket->connect(d_tcp_endpoint, error); if (error) throw boost::system::system_error(error); @@ -108,8 +108,8 @@ socket_pdu_impl::socket_pdu_impl(std::string type, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); } else if (type == "UDP_SERVER") { - d_udp_socket.reset( - new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); + d_udp_socket = + std::make_shared<boost::asio::ip::udp::socket>(d_io_service, d_udp_endpoint); d_udp_socket->async_receive_from( boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, @@ -121,8 +121,8 @@ socket_pdu_impl::socket_pdu_impl(std::string type, set_msg_handler(pdu::pdu_port_id(), [this](pmt::pmt_t msg) { this->udp_send(msg); }); } else if (type == "UDP_CLIENT") { - d_udp_socket.reset( - new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); + d_udp_socket = + std::make_shared<boost::asio::ip::udp::socket>(d_io_service, d_udp_endpoint); d_udp_socket->async_receive_from( boost::asio::buffer(d_rxbuf), d_udp_endpoint_other, |