Merge branch 'next' of github.com:gnss-sdr/gnss-sdr into pps_lime

src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc

@@ -25,7 +25,6 @@
 
 
 namespace ip = boost::asio::ip;
-using boost::asio::ip::tcp;
 
 // Buffer constants
 // TODO: Make these configurable
@@ -110,7 +109,7 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
     LOG(INFO) << "Connected to " << addr << ":" << port;
 
     // 4. Set nodelay
-    socket_.set_option(tcp::no_delay(true), ec);
+    socket_.set_option(ip::tcp::no_delay(true), ec);
     if (ec)
         {
             std::cout << "Failed to set no delay option.\n";

src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc

@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-using boost::asio::ip::tcp;
 
 Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0)
 {