aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorilovezfs <ilovezfs@icloud.com>2017-12-19 02:37:19 -0800
committermichael-west <michael.west@ettus.com>2017-12-19 16:41:33 -0800
commitd9d9d0a8a2e61b1b82e9799585cb7376f581f276 (patch)
tree0e8a0b1df01919859b98c9b0ea0324783486d566 /host
parent893609252b1935fc6d27aedaaf653f4ae62cfed4 (diff)
downloaduhd-d9d9d0a8a2e61b1b82e9799585cb7376f581f276.tar.gz
uhd-d9d9d0a8a2e61b1b82e9799585cb7376f581f276.tar.bz2
uhd-d9d9d0a8a2e61b1b82e9799585cb7376f581f276.zip
Fix build with Boost 1.66
Thanks to FX Coudert for suggesting this fix.
Diffstat (limited to 'host')
-rw-r--r--host/examples/network_relay.cpp4
-rw-r--r--host/lib/transport/tcp_zero_copy.cpp2
-rw-r--r--host/lib/transport/udp_simple.cpp2
-rw-r--r--host/lib/transport/udp_zero_copy.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp
index 7e354934a..84040b5e6 100644
--- a/host/examples/network_relay.cpp
+++ b/host/examples/network_relay.cpp
@@ -127,7 +127,7 @@ private:
wait_for_thread.notify_one(); // notify constructor that this thread has started
std::vector<char> buff(insane_mtu);
while (not boost::this_thread::interruption_requested()){
- if (wait_for_recv_ready(_server_socket->native())){
+ if (wait_for_recv_ready(_server_socket->native_handle())){
boost::mutex::scoped_lock lock(_endpoint_mutex);
const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint);
lock.unlock();
@@ -153,7 +153,7 @@ private:
wait_for_thread.notify_one(); // notify constructor that this thread has started
std::vector<char> buff(insane_mtu);
while (not boost::this_thread::interruption_requested()){
- if (wait_for_recv_ready(_client_socket->native())){
+ if (wait_for_recv_ready(_client_socket->native_handle())){
const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size()));
boost::mutex::scoped_lock lock(_endpoint_mutex);
_server_socket->send_to(asio::buffer(&buff.front(), len), _endpoint);
diff --git a/host/lib/transport/tcp_zero_copy.cpp b/host/lib/transport/tcp_zero_copy.cpp
index f2ae51695..934777208 100644
--- a/host/lib/transport/tcp_zero_copy.cpp
+++ b/host/lib/transport/tcp_zero_copy.cpp
@@ -154,7 +154,7 @@ public:
//create, open, and connect the socket
_socket.reset(new asio::ip::tcp::socket(_io_service));
_socket->connect(receiver_endpoint);
- _sock_fd = _socket->native();
+ _sock_fd = _socket->native_handle();
//packets go out ASAP
asio::ip::tcp::no_delay option(true);
diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp
index 0a93941b8..2a3f8c796 100644
--- a/host/lib/transport/udp_simple.cpp
+++ b/host/lib/transport/udp_simple.cpp
@@ -56,7 +56,7 @@ public:
}
size_t recv(const asio::mutable_buffer &buff, double timeout){
- if (not wait_for_recv_ready(_socket->native(), timeout)) return 0;
+ if (not wait_for_recv_ready(_socket->native_handle(), timeout)) return 0;
return _socket->receive_from(asio::buffer(buff), _recv_endpoint);
}
diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp
index 63044c1e3..944cc1ee5 100644
--- a/host/lib/transport/udp_zero_copy.cpp
+++ b/host/lib/transport/udp_zero_copy.cpp
@@ -190,7 +190,7 @@ public:
_socket = socket_sptr(new asio::ip::udp::socket(_io_service));
_socket->open(asio::ip::udp::v4());
_socket->connect(receiver_endpoint);
- _sock_fd = _socket->native();
+ _sock_fd = _socket->native_handle();
//allocate re-usable managed receive buffers
for (size_t i = 0; i < get_num_recv_frames(); i++){