aboutsummaryrefslogtreecommitdiffstats
path: root/host/examples/network_relay.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-09-28 11:18:57 +0200
committerMartin Braun <martin.braun@ettus.com>2019-11-26 12:21:32 -0800
commit1fe98e8701dd0b790b172762c3629db32956d1fc (patch)
tree7719e69633f9639f1dcdcf00ebf7db6c4cd6dda2 /host/examples/network_relay.cpp
parent8541a9b397fb53034c37dd00289aa96def24d410 (diff)
downloaduhd-1fe98e8701dd0b790b172762c3629db32956d1fc.tar.gz
uhd-1fe98e8701dd0b790b172762c3629db32956d1fc.tar.bz2
uhd-1fe98e8701dd0b790b172762c3629db32956d1fc.zip
uhd: Replace usage of boost smart pointers with C++11 counterparts
This removes the following Boost constructs: - boost::shared_ptr, boost::weak_ptr - boost::enable_shared_from_this - boost::static_pointer_cast, boost::dynamic_pointer_cast The appropriate includes were also removed. All C++11 versions of these require #include <memory>. Note that the stdlib and Boost versions have the exact same syntax, they only differ in the namespace (boost vs. std). The modifications were all done using sed, with the exception of boost::scoped_ptr, which was replaced by std::unique_ptr. References to boost::smart_ptr were also removed. boost::intrusive_ptr is not removed in this commit, since it does not have a 1:1 mapping to a C++11 construct.
Diffstat (limited to 'host/examples/network_relay.cpp')
-rw-r--r--host/examples/network_relay.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp
index bf2ac9255..6de268aa9 100644
--- a/host/examples/network_relay.cpp
+++ b/host/examples/network_relay.cpp
@@ -22,7 +22,7 @@
namespace po = boost::program_options;
namespace asio = boost::asio;
-typedef boost::shared_ptr<asio::ip::udp::socket> socket_type;
+typedef std::shared_ptr<asio::ip::udp::socket> socket_type;
static const size_t insane_mtu = 9000;
@@ -81,7 +81,7 @@ public:
asio::ip::udp::resolver::query query(asio::ip::udp::v4(), server_addr, port);
asio::ip::udp::endpoint endpoint = *resolver.resolve(query);
- _server_socket = boost::shared_ptr<asio::ip::udp::socket>(
+ _server_socket = std::shared_ptr<asio::ip::udp::socket>(
new asio::ip::udp::socket(_io_service, endpoint));
resize_buffs(_server_socket, server_rx_size, server_tx_size);
}
@@ -90,7 +90,7 @@ public:
asio::ip::udp::resolver::query query(asio::ip::udp::v4(), client_addr, port);
asio::ip::udp::endpoint endpoint = *resolver.resolve(query);
- _client_socket = boost::shared_ptr<asio::ip::udp::socket>(
+ _client_socket = std::shared_ptr<asio::ip::udp::socket>(
new asio::ip::udp::socket(_io_service));
_client_socket->open(asio::ip::udp::v4());
_client_socket->connect(endpoint);
@@ -215,14 +215,14 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
}
{
- boost::shared_ptr<udp_relay_type> ctrl(new udp_relay_type(bind, addr, "49152"));
- boost::shared_ptr<udp_relay_type> rxdsp0(new udp_relay_type(
+ std::shared_ptr<udp_relay_type> ctrl(new udp_relay_type(bind, addr, "49152"));
+ std::shared_ptr<udp_relay_type> rxdsp0(new udp_relay_type(
bind, addr, "49156", 0, tx_dsp_buff_size, rx_dsp_buff_size, 0));
- boost::shared_ptr<udp_relay_type> txdsp0(new udp_relay_type(
+ std::shared_ptr<udp_relay_type> txdsp0(new udp_relay_type(
bind, addr, "49157", tx_dsp_buff_size, 0, 0, tx_dsp_buff_size));
- boost::shared_ptr<udp_relay_type> rxdsp1(new udp_relay_type(
+ std::shared_ptr<udp_relay_type> rxdsp1(new udp_relay_type(
bind, addr, "49158", 0, tx_dsp_buff_size, rx_dsp_buff_size, 0));
- boost::shared_ptr<udp_relay_type> gps(new udp_relay_type(bind, addr, "49172"));
+ std::shared_ptr<udp_relay_type> gps(new udp_relay_type(bind, addr, "49172"));
std::signal(SIGINT, &sig_int_handler);
std::cout << "Press Ctrl + C to stop streaming..." << std::endl;