fairwaves / UHD-Fairwaves

Fairwaves version of the UHD drivers, tweaked to support Fairwaves UmTRX.
http://umtrx.org
24 stars 21 forks source link

umtrx fails to build with boost 1.66 #22

Closed pespin closed 6 years ago

pespin commented 6 years ago

Running archlinux with boost 1.66.0-2, compilation fails.

/UHD-Fairwaves/host/umtrx_monitor.cpp: In member function ‘void umtrx_impl::server_query_handler()’:
/UHD-Fairwaves/host/umtrx_monitor.cpp:121:58: error: ‘class boost::asio::basic_socket_acceptor<boost::asio::ip::tcp>’ has no member named ‘native’
     if (not wait_read_sockfd(_server_query_tcp_acceptor->native(), 100)) return;
                                                          ^~~~~~
/UHD-Fairwaves/host/umtrx_monitor.cpp: At global scope:
/UHD-Fairwaves/host/umtrx_monitor.cpp:86:13: warning: ‘bool wait_read_sockfd(int, size_t)’ defined but not used [-Wunused-function]
 static bool wait_read_sockfd(const int sockfd, const size_t timeoutMs)
             ^~~~~~~~~~~~~~~~
pespin commented 6 years ago

This fixes build for me:

diff --git a/host/umtrx_monitor.cpp b/host/umtrx_monitor.cpp
index 4fae86d1..e28f4ac4 100644
--- a/host/umtrx_monitor.cpp
+++ b/host/umtrx_monitor.cpp
@@ -118,7 +118,7 @@ void umtrx_impl::status_monitor_handler(void)
 void umtrx_impl::server_query_handler(void)
 {
     //accept the client socket (timeout is 100 ms, task is called again)
-    if (not wait_read_sockfd(_server_query_tcp_acceptor->native(), 100)) return;
+    if (not wait_read_sockfd(_server_query_tcp_acceptor->native_handle(), 100)) return;
     boost::shared_ptr<asio::ip::tcp::socket> socket(new asio::ip::tcp::socket(_server_query_io_service));
     _server_query_tcp_acceptor->accept(*socket);
chemeris commented 6 years ago

Fixed with the merge above. Thank you, @pespin!