diff options
| author | ilovezfs <ilovezfs@icloud.com> | 2017-12-19 02:37:19 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-19 09:17:19 -0800 |
| commit | 707db05b5a4a2453c63b24f92d357d63d7962b11 (patch) | |
| tree | 37a7369e6bfb054edc045fc1cc3210ad1992b23b | |
| parent | 85a707d7fff008e15e8f83c66dbbe253d6093479 (diff) | |
| download | uhd-707db05b5a4a2453c63b24f92d357d63d7962b11.tar.gz uhd-707db05b5a4a2453c63b24f92d357d63d7962b11.tar.bz2 uhd-707db05b5a4a2453c63b24f92d357d63d7962b11.zip | |
Fix build with Boost 1.66
Thanks to FX Coudert for suggesting this fix.
| -rw-r--r-- | host/examples/network_relay.cpp | 4 | ||||
| -rw-r--r-- | host/lib/transport/tcp_zero_copy.cpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/udp_simple.cpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/udp_zero_copy.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp index c21b2696e..1c16e1781 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 dc1848b00..4c434527c 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 75862d1a9..c469e5b1b 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 e9d8c3172..9a80fafd1 100644 --- a/host/lib/transport/udp_zero_copy.cpp +++ b/host/lib/transport/udp_zero_copy.cpp @@ -191,7 +191,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(); UHD_LOGGER_TRACE("UDP") << boost::format("Local UDP socket endpoint: %s:%s") |