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

src/algorithms/signal_source/adapters/zmq_signal_source.cc

@@ -44,6 +44,7 @@ ZmqSignalSource::ZmqSignalSource(const ConfigurationInterface* configuration,
             LOG(INFO) << "Connecting to ZMQ pub at " << endpoint;
             // work around gnuradio interface deficiency
             d_source_block = gr::zeromq::sub_source::make(d_item_size, vlen, const_cast<char*>(endpoint.data()), timeout_ms, pass_tags, hwm);
+            d_source_block->set_tag_propagation_policy(gr::block::TPP_DONT);  // GNSS-SDR doesn't do well with tags/
         }
     else
         {
@@ -94,9 +95,13 @@ auto ZmqSignalSource::get_right_block() -> gr::basic_block_sptr
     auto result = gr::basic_block_sptr();
 
     if (d_vec_block)
-        result = d_vec_block;  // NOLINT
+        {
+            result = d_vec_block;
+        }
     else
-        result = d_source_block;  // NOLINT
+        {
+            result = d_source_block;
+        }
 
     return result;
 }

src/algorithms/signal_source/libs/fpga_switch.h

@@ -23,6 +23,7 @@
 #ifndef GNSS_SDR_FPGA_SWITCH_H
 #define GNSS_SDR_FPGA_SWITCH_H
 
+#include <cstdint>
 #include <string>
 
 /** \addtogroup Signal_Source