Reorder includes: local headers first, then 3rd-party library headers, and finally standard headers

src/algorithms/signal_source/adapters/file_signal_source.cc

@@ -31,14 +31,14 @@
  */
 
 #include "file_signal_source.h"
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <exception>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include "gnss_sdr_valve.h"
+#include <glog/logging.h>
+#include <iostream>  // for std::cerr
+#include <fstream>
+#include <iomanip>
+#include <exception>
 
 
 

src/algorithms/signal_source/adapters/file_signal_source.h

@@ -35,14 +35,13 @@
 #ifndef GNSS_SDR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/flexiband_signal_source.cc

@@ -29,11 +29,11 @@
  */
 
 #include "flexiband_signal_source.h"
+#include "configuration_interface.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
 #include <teleorbit/frontend.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/flexiband_signal_source.h

@@ -33,14 +33,14 @@
 #ifndef FLEXIBAND_SIGNAL_SOURCE_H_
 #define FLEXIBAND_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/char_to_float.h>
 #include <gnuradio/blocks/float_to_complex.h>
+#include <string>
 #include <vector>
-#include "gnss_block_interface.h"
 
 
 class ConfigurationInterface;

src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc

@@ -30,11 +30,12 @@
  */
 
 #include "fmcomms2_signal_source.h"
-#include <iostream>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <iostream>
+
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/fmcomms2_signal_source.h

@@ -33,12 +33,12 @@
 #ifndef GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_
 #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/iio/fmcomms2_source.h>
-#include "gnss_block_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/gen_signal_source.cc

@@ -31,13 +31,12 @@
  */
 
 #include "gen_signal_source.h"
-#include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/message.h>
 #include <glog/logging.h>
+#include <sstream>
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/gen_signal_source.h

@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_GEN_SIGNAL_SOURCE_H_
 #define GNSS_SDR_GEN_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
 
+#include "gnss_block_interface.h"
+#include <gnuradio/msg_queue.h>
+#include <string>
 
 /*!
  * \brief This class wraps blocks that generates synthesized GNSS signal and

src/algorithms/signal_source/adapters/gn3s_signal_source.cc

@@ -29,11 +29,11 @@
  */
 
 #include "gn3s_signal_source.h"
+#include "configuration_interface.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
 #include <gn3s/gn3s_source_cc.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/gn3s_signal_source.h

@@ -32,11 +32,11 @@
 #ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
 #define GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/signal_source/adapters/labsat_signal_source.cc

@@ -29,9 +29,10 @@
  */
 
 #include "labsat_signal_source.h"
-#include <glog/logging.h>
-#include "labsat23_source.h"
 #include "configuration_interface.h"
+#include "labsat23_source.h"
+#include <glog/logging.h>
+
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/labsat_signal_source.h

@@ -32,12 +32,11 @@
 #ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
 #define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/nsr_file_signal_source.cc

@@ -31,14 +31,14 @@
  */
 
 #include "nsr_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/nsr_file_signal_source.h

@@ -35,15 +35,14 @@
 #ifndef GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_byte_2bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "unpack_byte_2bit_samples.h"
-
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/osmosdr_signal_source.cc

@@ -30,13 +30,14 @@
  */
 
 #include "osmosdr_signal_source.h"
-#include <iostream>
-#include <boost/format.hpp>
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <boost/format.hpp>
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <iostream>
+
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/osmosdr_signal_source.h

@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_
 #define GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_
 
-#include <stdexcept>
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <osmosdr/source.h>
-#include "gnss_block_interface.h"
+#include <stdexcept>
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/plutosdr_signal_source.cc

@@ -29,11 +29,11 @@
  */
 
 #include "plutosdr_signal_source.h"
-#include <iostream>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <iostream>
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/plutosdr_signal_source.h

@@ -32,12 +32,13 @@
 #ifndef GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
 #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/iio/pluto_source.h>
-#include "gnss_block_interface.h"
+#include <string>
+
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/raw_array_signal_source.cc

@@ -29,11 +29,11 @@
  */
 
 #include "raw_array_signal_source.h"
+#include "configuration_interface.h"
+#include <dbfcttc/raw_array.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
-#include <dbfcttc/raw_array.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/raw_array_signal_source.h

@@ -32,12 +32,11 @@
 #ifndef RAW_ARRAY_SIGNAL_SOURCE_H_
 #define RAW_ARRAY_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc

@@ -31,12 +31,13 @@
  */
 
 #include "rtl_tcp_signal_source.h"
-#include <glog/logging.h>
-#include <iostream>
-#include <boost/format.hpp>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <boost/format.hpp>
+#include <glog/logging.h>
+#include <iostream>
+
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h

@@ -32,15 +32,16 @@
 #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
 #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
 
-#include <stdexcept>
-#include <string>
+#include "rtl_tcp_signal_source_c.h"
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/deinterleave.h>
 #include <gnuradio/blocks/float_to_complex.h>
-#include "rtl_tcp_signal_source_c.h"
-#include "gnss_block_interface.h"
+#include <stdexcept>
+#include <string>
+
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/spir_file_signal_source.cc

@@ -30,14 +30,14 @@
  */
 
 #include "spir_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/spir_file_signal_source.h

@@ -32,15 +32,14 @@
 #ifndef GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_intspir_1bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "unpack_intspir_1bit_samples.h"
-
+#include <string>
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc

@@ -30,13 +30,13 @@
  */
 
 #include "spir_gss6450_file_signal_source.h"
+#include "configuration_interface.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <cstdio>
-#include <glog/logging.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h

@@ -32,8 +32,9 @@
 #ifndef GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
+#include "gnss_sdr_valve.h"
+#include "unpack_spir_gss6450_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
@@ -42,9 +43,8 @@
 #include <gnuradio/blocks/endian_swap.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "gnss_sdr_valve.h"
-#include "unpack_spir_gss6450_samples.h"
+#include <string>
+#include <vector>
 
 
 class ConfigurationInterface;

src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc

@@ -30,14 +30,14 @@
  */
 
 #include "two_bit_cpx_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
-#include "configuration_interface.h"
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h

@@ -34,16 +34,15 @@
 #ifndef GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_byte_2bit_cpx_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/interleaved_short_to_complex.h>
-#include "gnss_block_interface.h"
-#include "unpack_byte_2bit_cpx_samples.h"
-
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc

@@ -31,16 +31,15 @@
  */
 
 #include "two_bit_packed_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/char_to_float.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include <gnuradio/blocks/char_to_float.h>
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
-#include "configuration_interface.h"
-
 
 
 using google::LogMessage;

src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h

@@ -35,16 +35,15 @@
 #ifndef GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_2bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
-#include "gnss_block_interface.h"
-#include "unpack_2bit_samples.h"
-
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/signal_source/adapters/uhd_signal_source.cc

@@ -29,14 +29,15 @@
  */
 
 #include "uhd_signal_source.h"
-#include <iostream>
-#include <uhd/types/device_addr.hpp>
-#include <uhd/exception.hpp>
-#include <volk/volk.h>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <uhd/types/device_addr.hpp>
+#include <uhd/exception.hpp>
+#include <volk/volk.h>
+#include <iostream>
+
 
 using google::LogMessage;
 

src/algorithms/signal_source/adapters/uhd_signal_source.h

@@ -31,14 +31,15 @@
 #ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H_
 #define GNSS_SDR_UHD_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/uhd/usrp_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
+#include <string>
+#include <vector>
+
 
 class ConfigurationInterface;
 

src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h

@@ -40,12 +40,12 @@
 
 #include "rtl_tcp_dongle_info.h"
 #include <boost/asio.hpp>
-#include <gnuradio/sync_block.h>
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/array.hpp>
 #include <boost/circular_buffer.hpp>
+#include <gnuradio/sync_block.h>
+#include <string>
 
 class rtl_tcp_signal_source_c;
 

src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h

@@ -68,9 +68,8 @@
 #ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H
 #define GNSS_SDR_UNPACK_2BIT_SAMPLES_H
 
-#include <cstdint>
 #include <gnuradio/sync_interpolator.h>
-
+#include <cstdint>
 
 class unpack_2bit_samples;
 

src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc

@@ -32,8 +32,8 @@
  */
 
 #include "rtl_tcp_dongle_info.h"
-#include <string>
 #include <boost/foreach.hpp>
+#include <string>
 
 using boost::asio::ip::tcp;