summaryrefslogtreecommitdiff
path: root/gr-blocks/lib/tcp_server_sink_impl.h
diff options
context:
space:
mode:
authorThomas Habets <thomas@habets.se>2020-08-11 11:18:07 +0100
committerMartin Braun <martin@gnuradio.org>2020-08-14 04:19:58 -0700
commit65cc420b46b8c4d715be0fe8f70e6a54f8ee0166 (patch)
tree1de0552dc4c99218aceac95935c23148123f6e1e /gr-blocks/lib/tcp_server_sink_impl.h
parent487da72790363937c20f93500a1883ac0fc93582 (diff)
blocks/tcp_server_sink: Remove manual memory management
Diffstat (limited to 'gr-blocks/lib/tcp_server_sink_impl.h')
-rw-r--r--gr-blocks/lib/tcp_server_sink_impl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h
index 6e75432302..47e157f84a 100644
--- a/gr-blocks/lib/tcp_server_sink_impl.h
+++ b/gr-blocks/lib/tcp_server_sink_impl.h
@@ -28,13 +28,13 @@ private:
gr::thread::thread d_io_serv_thread;
boost::asio::ip::tcp::endpoint d_endpoint;
std::unique_ptr<boost::asio::ip::tcp::socket> d_socket;
- std::set<boost::asio::ip::tcp::socket*> d_sockets;
+ std::set<std::unique_ptr<boost::asio::ip::tcp::socket>> d_sockets;
boost::asio::ip::tcp::acceptor d_acceptor;
- std::shared_ptr<uint8_t[]> d_buf;
enum {
BUF_SIZE = 256 * 1024,
};
+ std::array<uint8_t, BUF_SIZE> d_buf;
int d_writing;
boost::condition_variable d_writing_cond;
@@ -43,7 +43,7 @@ private:
void do_accept(const boost::system::error_code& error);
void do_write(const boost::system::error_code& error,
std::size_t len,
- std::set<boost::asio::ip::tcp::socket*>::iterator);
+ std::set<std::unique_ptr<boost::asio::ip::tcp::socket>>::iterator);
public:
tcp_server_sink_impl(size_t itemsize,