Update to 3.10.3.0 and try to fix compilation under current.

5 files changed, 0 insertions, 51 deletions

diff --git a/comms/uhd/files/patch-examples_CMakeLists.txt b/comms/uhd/files/patch-examples_CMakeLists.txt
deleted file mode 100644
index 72b7f0ce8e7e..000000000000
--- a/comms/uhd/files/patch-examples_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- host/examples/CMakeLists.txt.orig	2015-11-14 16:31:04.640272000 +0000
-+++ host/examples/CMakeLists.txt	2015-11-14 17:26:27.512820000 +0000
-@@ -50,4 +50,5 @@
-     UHD_INSTALL(TARGETS ${example_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
- ENDFOREACH(example_source)
-+TARGET_LINK_LIBRARIES(network_relay -pthread)
- 
- ########################################################################
diff --git a/comms/uhd/files/patch-host_examples_network_relay.cpp b/comms/uhd/files/patch-host_examples_network_relay.cpp
deleted file mode 100644
index 3bc737bef508..000000000000
--- a/comms/uhd/files/patch-host_examples_network_relay.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- host/examples/network_relay.cpp.orig	2017-12-17 19:37:02.232333000 +0000
-+++ host/examples/network_relay.cpp	2017-12-17 19:37:35.331222000 +0000
-@@ -128,5 +128,5 @@
-         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);
-@@ -154,5 +154,5 @@
-         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);
diff --git a/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp b/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp
deleted file mode 100644
index 0b00e14f0a87..000000000000
--- a/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- host/lib/transport/tcp_zero_copy.cpp.orig	2017-12-17 19:39:49.890757000 +0000
-+++ host/lib/transport/tcp_zero_copy.cpp	2017-12-17 19:40:36.125127000 +0000
-@@ -155,5 +155,5 @@
-         _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
diff --git a/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp b/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp
deleted file mode 100644
index 7bc6bf3598aa..000000000000
--- a/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- host/lib/transport/udp_simple.cpp.orig	2017-12-17 19:40:02.609104000 +0000
-+++ host/lib/transport/udp_simple.cpp	2017-12-17 19:40:47.660730000 +0000
-@@ -57,5 +57,5 @@
- 
-     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/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp b/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp
deleted file mode 100644
index b2608b698be0..000000000000
--- a/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- host/lib/transport/udp_zero_copy.cpp.orig	2017-12-17 16:25:59.637675000 +0100
-+++ host/lib/transport/udp_zero_copy.cpp	2017-12-17 16:26:12.713784000 +0100
-@@ -191,5 +191,5 @@
-         _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