Cleaning includes

2025-05-30 21:24:09 +00:00 · 2016-01-04 22:56:52 +01:00 · 2016-01-04 22:56:52 +01:00 · d0ac06d71d
commit d0ac06d71d
parent 972c86c1ea
65 changed files with 375 additions and 493 deletions
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
@ -30,11 +30,8 @@

 #include "galileo_e1_pvt_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <iostream>
 #include <map>
-#include <sstream>
-#include <vector>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
@ -32,11 +32,8 @@
 #define	GNSS_SDR_GALILEO_E1_PVT_CC_H

 #include <fstream>
-#include <queue>
-#include <utility>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <utility>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
@ -29,11 +29,9 @@

 #include "gps_l1_ca_pvt_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <iostream>
 #include <map>
-#include <sstream>
-#include <vector>
+#include <utility>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
@ -31,11 +31,7 @@
 #define	GNSS_SDR_GPS_L1_CA_PVT_CC_H

 #include <fstream>
-#include <queue>
-#include <utility>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
@ -30,11 +30,8 @@

 #include "hybrid_pvt_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <iostream>
 #include <map>
-#include <sstream>
-#include <vector>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
@ -32,11 +32,8 @@
 #define	GNSS_SDR_HYBRID_PVT_CC_H

 #include <fstream>
-#include <queue>
 #include <utility>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@ -33,7 +33,6 @@
 */

 #include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
-#include <iostream>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include "gps_sdr_signal_processing.h"
@ -46,17 +45,14 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
        ConfigurationInterface* configuration, std::string role,
        unsigned int in_streams, unsigned int out_streams,
        boost::shared_ptr<gr::msg_queue> queue) :
-    role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(
-            queue)
+    role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
 {
-
    std::string default_item_type = "gr_complex";
    std::string default_dump_filename = "./data/acquisition.dat";

    DLOG(INFO) << "role " << role;

-    item_type_ = configuration->property(role + ".item_type",
-            default_item_type);
+    item_type_ = configuration->property(role + ".item_type", default_item_type);

    fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
    if_ = configuration->property(role + ".ifreq", 0);
@ -65,8 +61,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
    doppler_min_ = configuration->property(role + ".doppler_min", -5000);
    sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
    max_dwells_= configuration->property(role + ".max_dwells", 1);
-    dump_filename_ = configuration->property(role + ".dump_filename",
-            default_dump_filename);
+    dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);

    //--- Find number of samples per spreading code -------------------------
    vector_length_ = round(fs_in_
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
@ -36,7 +36,6 @@

 #include <string>
 #include <gnuradio/msg_queue.h>
-#include <gnuradio/blocks/stream_to_vector.h>
 #include "gnss_synchro.h"
 #include "acquisition_interface.h"
 #include "pcps_acquisition_fine_doppler_cc.h"
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
@ -36,7 +36,6 @@

 #include <string>
 #include <gnuradio/msg_queue.h>
-#include <gnuradio/blocks/stream_to_vector.h>
 #include "gnss_synchro.h"
 #include "acquisition_interface.h"
 #include "pcps_assisted_acquisition_cc.h"
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@ -36,7 +36,6 @@
 */

 #include "galileo_e5a_noncoherent_iq_acquisition_caf_cc.h"
-#include <sys/time.h>
 #include <sstream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
@ -39,10 +39,7 @@
 #define GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@ -34,9 +34,6 @@

 #include <fstream>
 #include <string>
-#include <queue>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
@ -33,14 +33,14 @@
 */

 #include "pcps_acquisition_cc.h"
-#include <sys/time.h>
 #include <sstream>
+#include <boost/filesystem.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
 #include "gnss_signal_processing.h"
 #include "control_message_factory.h"
-#include <boost/filesystem.hpp>
+

 using google::LogMessage;

--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
@ -51,7 +51,6 @@
 #define GNSS_SDR_PCPS_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@ -42,7 +42,6 @@
 #include "gps_sdr_signal_processing.h"
 #include "control_message_factory.h"

-
 using google::LogMessage;

 pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@ -49,10 +49,7 @@
 #define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@ -49,10 +49,7 @@
 #define GNSS_SDR_PCPS_ASSISTED_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@ -38,11 +38,7 @@
 #define GNSS_SDR_PCPS_CCCWSR_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/shared_array.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
@ -34,6 +34,8 @@

 #include "pcps_multithread_acquisition_cc.h"
 #include <sstream>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
@ -52,11 +52,8 @@

 #include <algorithm>
 #include <fstream>
-#include <queue>
 #include <string>
 #include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@ -49,7 +49,6 @@
 */

 #include "pcps_opencl_acquisition_cc.h"
-#include <sys/time.h>
 #include <algorithm>
 #include <fstream>
 #include <iostream>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
@ -52,11 +52,8 @@
 #define GNSS_SDR_PCPS_OPENCL_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
 #include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@ -29,7 +29,6 @@
 */

 #include "pcps_quicksync_acquisition_cc.h"
-#include <ctime>
 #include <cmath>
 #include <sstream>
 #include <gnuradio/io_signature.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@ -52,13 +52,10 @@
 #define GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
 #include <algorithm>
 #include <functional>
 #include <assert.h>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@ -52,10 +52,7 @@
 #define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
@ -32,16 +32,14 @@

 #include "galileo_e1_observables_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <cmath>
 #include <iostream>
 #include <map>
-#include <sstream>
+#include <utility>
 #include <vector>
 #include <armadillo>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-//#include "control_message_factory.h"
 #include "gnss_synchro.h"
 #include "Galileo_E1.h"
 #include "galileo_navigation_message.h"
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
@ -35,19 +35,10 @@


 #include <fstream>
-#include <queue>
 #include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>

-//#include "concurrent_queue.h"
-//#include "galileo_navigation_message.h"
-//#include "rinex_printer.h"
-//#include "Galileo_E1.h"
-//#include "gnss_synchro.h"

 class galileo_e1_observables_cc;

@ -63,7 +54,7 @@ class galileo_e1_observables_cc : public gr::block
 {
 public:
    ~galileo_e1_observables_cc ();
-    //void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
+
    int general_work (int noutput_items, gr_vector_int &ninput_items,
            gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);

--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
@ -29,12 +29,11 @@

 #include "gps_l1_ca_observables_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <cmath>
 #include <iostream>
 #include <map>
-#include <sstream>
 #include <vector>
+#include <utility>
 #include <armadillo>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
@ -33,12 +33,8 @@

 #include <deque>
 #include <fstream>
-#include <queue>
 #include <string>
-#include <utility>
 #include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@ -31,11 +31,10 @@

 #include "hybrid_observables_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <cmath>
 #include <iostream>
 #include <map>
-#include <sstream>
+#include <utility>
 #include <vector>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@ -30,15 +30,11 @@
 */


-#ifndef GNSS_SDR_hybrid_observables_CC_H
-#define	GNSS_SDR_hybrid_observables_CC_H
+#ifndef GNSS_SDR_HYBRID_OBSERVABLES_CC_H
+#define	GNSS_SDR_HYBRID_OBSERVABLES_CC_H

 #include <fstream>
-#include <queue>
 #include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>

--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
@ -29,12 +29,11 @@

 #include "mixed_observables_cc.h"
 #include <algorithm>
-#include <bitset>
 #include <cmath>
 #include <iostream>
 #include <map>
-#include <sstream>
 #include <vector>
+#include <utility>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
@ -32,11 +32,7 @@
 #define	GNSS_SDR_MIXED_OBSERVABLES_CC_H_

 #include <fstream>
-#include <queue>
 #include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>

--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
@ -30,7 +30,6 @@


 #include "unpack_2bit_samples.h"
-#include <iostream>
 #include <gnuradio/io_signature.h>

 struct byte_2bit_struct
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@ -68,8 +68,10 @@
 #ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H
 #define GNSS_SDR_UNPACK_2BIT_SAMPLES_H

+#include <cstdint>
 #include <gnuradio/sync_interpolator.h>

+
 class unpack_2bit_samples;

 typedef boost::shared_ptr<unpack_2bit_samples> unpack_2bit_samples_sptr;
@ -92,6 +94,13 @@ private:
                                          size_t item_size,
                                          bool big_endian_items,
                                          bool reverse_interleaving);
+    bool big_endian_bytes_;
+    size_t item_size_;
+    bool big_endian_items_;
+    bool swap_endian_items_;
+    bool swap_endian_bytes_;
+    bool reverse_interleaving_;
+    std::vector< int8_t > work_buffer_;

 public:
    unpack_2bit_samples( bool big_endianBytes,
@ -104,16 +113,6 @@ public:
    int work (int noutput_items,
              gr_vector_const_void_star &input_items,
              gr_vector_void_star &output_items);
-
-private:
-    bool big_endian_bytes_;
-    size_t item_size_;
-    bool big_endian_items_;
-    bool swap_endian_items_;
-    bool swap_endian_bytes_;
-    bool reverse_interleaving_;
-    std::vector< int8_t > work_buffer_;
-    
 };

 #endif
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc
@ -34,7 +34,6 @@


 #include "unpack_byte_2bit_cpx_samples.h"
-#include <iostream>
 #include <gnuradio/io_signature.h>

 struct byte_2bit_struct
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
@ -50,8 +50,7 @@ unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples();
 class unpack_byte_2bit_cpx_samples: public gr::sync_interpolator
 {
 private:
-    friend unpack_byte_2bit_cpx_samples_sptr
-    make_unpack_byte_2bit_cpx_samples_sptr();
+    friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();

 public:
    unpack_byte_2bit_cpx_samples();
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc
@ -30,7 +30,6 @@


 #include "unpack_byte_2bit_samples.h"
-#include <iostream>
 #include <gnuradio/io_signature.h>

 struct byte_2bit_struct
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc
@ -30,7 +30,6 @@


 #include "unpack_intspir_1bit_samples.h"
-#include <iostream>
 #include <gnuradio/io_signature.h>


--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
@ -34,12 +34,14 @@
 #include "galileo_e1b_telemetry_decoder.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include "configuration_interface.h"
+#include "concurrent_queue.h"
 #include "galileo_ephemeris.h"
 #include "galileo_almanac.h"
 #include "galileo_iono.h"
 #include "galileo_utc_model.h"
-#include "configuration_interface.h"
-#include "galileo_e1b_telemetry_decoder_cc.h"
+
+

 extern concurrent_queue<Galileo_Ephemeris> global_galileo_ephemeris_queue;
 extern concurrent_queue<Galileo_Iono> global_galileo_iono_queue;
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
@ -35,9 +35,9 @@
 */

 #include "galileo_e5a_telemetry_decoder.h"
-#include <boost/shared_ptr.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include "concurrent_queue.h"
 #include "galileo_ephemeris.h"
 #include "galileo_almanac.h"
 #include "galileo_iono.h"
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
@ -33,6 +33,7 @@
 #include "gps_l1_ca_telemetry_decoder.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include "concurrent_queue.h"
 #include "gps_ephemeris.h"
 #include "gps_almanac.h"
 #include "gps_iono.h"
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc
@ -33,12 +33,13 @@
 #include "gps_l2_m_telemetry_decoder.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include "concurrent_queue.h"
 #include "gps_cnav_ephemeris.h"
 #include "gps_almanac.h"
 #include "gps_cnav_iono.h"
 #include "gps_cnav_utc_model.h"
 #include "configuration_interface.h"
-#include "concurrent_queue.h"
+

 extern concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_queue;
 extern concurrent_queue<Gps_CNAV_Iono> global_gps_cnav_iono_queue;
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
@ -33,6 +33,7 @@
 #include "sbas_l1_telemetry_decoder.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include "concurrent_queue.h"
 #include "sbas_telemetry_data.h"
 #include "sbas_ionospheric_correction.h"
 #include "sbas_satellite_correction.h"
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@ -31,10 +31,9 @@


 #include "galileo_e1b_telemetry_decoder_cc.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
@ -34,20 +34,17 @@
 */

 #include "galileo_e5a_telemetry_decoder_cc.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-//#include "galileo_navigation_message.h"
 #include "galileo_fnav_message.h"
 #include "gnss_synchro.h"
 #include "convolutional.h"
-//#include <volk/volk.h>
-//#include "galileo_e1b_telemetry_decoder_cc.h"
+

 #define CRC_ERROR_LIMIT 6

@ -60,6 +57,7 @@ galileo_e5a_make_telemetry_decoder_cc(Gnss_Satellite satellite, boost::shared_pt
    return galileo_e5a_telemetry_decoder_cc_sptr(new galileo_e5a_telemetry_decoder_cc(satellite, queue, dump));
 }

+
 void galileo_e5a_telemetry_decoder_cc::forecast (int noutput_items, gr_vector_int &ninput_items_required)
 {
    //ninput_items_required[0] = GALILEO_FNAV_SAMPLES_PER_PAGE; // set the required sample history
@ -69,6 +67,7 @@ void galileo_e5a_telemetry_decoder_cc::forecast (int noutput_items, gr_vector_in
        }
 }

+
 void galileo_e5a_telemetry_decoder_cc::viterbi_decoder(double *page_part_symbols, int *page_part_bits)
 {
    //    int CodeLength = 240;
@ -121,6 +120,7 @@ void galileo_e5a_telemetry_decoder_cc::deinterleaver(int rows, int cols, double
        }
 }

+
 void galileo_e5a_telemetry_decoder_cc::decode_word(double *page_symbols,int frame_length)
 {
    double page_symbols_deint[frame_length];
@ -266,11 +266,13 @@ galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc(
    flag_TOW_set = false;
 }

+
 galileo_e5a_telemetry_decoder_cc::~galileo_e5a_telemetry_decoder_cc()
 {
    d_dump_file.close();
 }

+
 int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
        gr_vector_const_void_star &input_items,	gr_vector_void_star &output_items)
 {
@ -449,7 +451,7 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
                                            break;
                                        }
                                }
-				//
+
                            if (corr_flag==true) // NEW PREAMBLE RECEIVED. DECODE PAGE
                                {
                                    d_preamble_index = d_sample_counter - GALILEO_FNAV_CODES_PER_PREAMBLE;//record the preamble sample stamp
@ -587,6 +589,7 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
    return 1;
 }

+
 void galileo_e5a_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite)
 {
    d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
@ -621,6 +624,7 @@ void galileo_e5a_telemetry_decoder_cc::set_channel(int channel)
        }
 }

+
 void galileo_e5a_telemetry_decoder_cc::set_ephemeris_queue(concurrent_queue<Galileo_Ephemeris> *ephemeris_queue)
 {
    d_ephemeris_queue = ephemeris_queue;
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@ -36,7 +36,6 @@

 #include "gps_l1_ca_telemetry_decoder_cc.h"
 #include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@ -36,7 +36,6 @@

 #include "galileo_e1_dll_pll_veml_tracking.h"
 #include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"

--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@ -37,7 +37,6 @@

 #include "galileo_e1_tcp_connector_tracking.h"
 #include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"

--- a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
@ -36,7 +36,6 @@

 #include "galileo_volk_e1_dll_pll_veml_tracking.h"
 #include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"

--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
@ -33,14 +33,10 @@
 #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <string>
 #include <map>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-//#include <volk/volk.h>
 #include "concurrent_queue.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@ -40,11 +40,8 @@
 #define	GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
@ -38,11 +38,8 @@
 #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
@ -34,11 +34,8 @@


 #include <fstream>
-#include <queue>
 #include <string>
 #include <map>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <volk/volk.h>
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h
@ -38,11 +38,8 @@
 #define	GNSS_SDR_GPS_L1_CA_DLL_FLL_PLL_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@ -38,11 +38,8 @@
 #define	GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
@ -38,11 +38,8 @@
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
@ -38,11 +38,8 @@
 #define	GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
@ -37,11 +37,8 @@
 #define	GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@ -38,11 +38,8 @@
 #define	GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H

 #include <fstream>
-#include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
@ -40,8 +40,6 @@
 #include <queue>
 #include <map>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
--- a/src/algorithms/tracking/libs/correlator.cc
+++ b/src/algorithms/tracking/libs/correlator.cc
@ -35,8 +35,8 @@


 #include "correlator.h"
-#include <iostream>
 #include <volk/volk.h>
+
 #if USING_VOLK_CW_EPL_CORR_CUSTOM
  #define LV_HAVE_SSE3
  #include "volk_cw_epl_corr.h"
--- a/src/algorithms/tracking/libs/correlator.h
+++ b/src/algorithms/tracking/libs/correlator.h
@ -37,7 +37,6 @@
 #ifndef GNSS_SDR_CORRELATOR_H_
 #define GNSS_SDR_CORRELATOR_H_

-#include <string>
 #include <gnuradio/gr_complex.h>

 #if !defined(GENERIC_ARCH) && HAVE_SSE3