diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2020-12-19 14:46:52 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2021-01-04 08:53:17 -0800 |
| commit | acf08b91594bbbcd0649a55ff377f242459f1a07 (patch) | |
| tree | 574ab0c47a44200166d19c77f55b6fcacb8877a2 /gr-blocks/lib | |
| parent | 57df09de3a2e27aca42eca621d452f03b15b67b6 (diff) | |
C++14: Use std::make_unique instead of boost::make_unique
Also, clean up includes
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'gr-blocks/lib')
| -rw-r--r-- | gr-blocks/lib/tcp_server_sink_impl.cc | 8 | ||||
| -rw-r--r-- | gr-blocks/lib/udp_sink_impl.cc | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/udp_source_impl.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc index 1cd6c2b14..ad62269a2 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.cc +++ b/gr-blocks/lib/tcp_server_sink_impl.cc @@ -20,8 +20,8 @@ #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <boost/make_unique.hpp> #include <algorithm> +#include <memory> #include <stdexcept> namespace gr { @@ -57,12 +57,12 @@ tcp_server_sink_impl::tcp_server_sink_impl(size_t itemsize, d_acceptor.listen(); if (!noblock) { - auto sock = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + auto sock = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.accept(*sock, d_endpoint); d_sockets.insert(std::move(sock)); } - d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, @@ -76,7 +76,7 @@ void tcp_server_sink_impl::do_accept(const boost::system::error_code& error) if (!error) { gr::thread::scoped_lock guard(d_writing_mut); d_sockets.insert(std::move(d_socket)); - d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc index 3eff348ee..24370f322 100644 --- a/gr-blocks/lib/udp_sink_impl.cc +++ b/gr-blocks/lib/udp_sink_impl.cc @@ -20,7 +20,7 @@ #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <boost/make_unique.hpp> +#include <memory> #include <stdexcept> namespace gr { @@ -65,7 +65,7 @@ void udp_sink_impl::connect(const std::string& host, int port) host, s_port, boost::asio::ip::resolver_query_base::passive); d_endpoint = *resolver.resolve(query); - d_socket = boost::make_unique<boost::asio::ip::udp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::udp::socket>(d_io_service); d_socket->open(d_endpoint.protocol()); boost::asio::socket_base::reuse_address roption(true); diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index e13fc60e3..fe07e055f 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -19,7 +19,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#include <boost/make_unique.hpp> +#include <memory> #include <stdexcept> namespace gr { @@ -74,7 +74,7 @@ void udp_source_impl::connect(const std::string& host, int port) d_host, s_port, boost::asio::ip::resolver_query_base::passive); d_endpoint = *resolver.resolve(query); - d_socket = boost::make_unique<boost::asio::ip::udp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::udp::socket>(d_io_service); d_socket->open(d_endpoint.protocol()); boost::asio::socket_base::reuse_address roption(true); |