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

2026-04-29 10:11:26 +00:00 · 2018-02-26 03:15:53 +01:00
parent 24f6003ba0
commit 658e677fc3
266 changed files with 968 additions and 994 deletions
--- a/src/algorithms/libs/complex_float_to_complex_byte.cc
+++ b/src/algorithms/libs/complex_float_to_complex_byte.cc
@@ -31,9 +31,7 @@

 #include "complex_float_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
-#include "volk_gnsssdr/volk_gnsssdr.h"
-
+#include <volk_gnsssdr/volk_gnsssdr.h>


 complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte()
@@ -47,7 +45,7 @@ complex_float_to_complex_byte::complex_float_to_complex_byte() : sync_block("com
                        gr::io_signature::make (1, 1, sizeof(gr_complex)),
                        gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
 {
-    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t);
    set_alignment(std::max(1, alignment_multiple));
 }

--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -31,9 +31,9 @@
 */

 #include "galileo_e1_signal_processing.h"
-#include <string>
 #include "Galileo_E1.h"
 #include "gnss_signal_processing.h"
+#include <string>


 void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn)
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -32,9 +32,9 @@
 */

 #include "galileo_e5_signal_processing.h"
-#include <gnuradio/math.h>
 #include "Galileo_E5a.h"
 #include "gnss_signal_processing.h"
+#include <gnuradio/gr_complex.h>



--- a/src/algorithms/libs/gnss_sdr_flags.cc
+++ b/src/algorithms/libs/gnss_sdr_flags.cc
@@ -29,7 +29,7 @@
 */


-#include <gnss_sdr_flags.h>
+#include "gnss_sdr_flags.h"
 #include <cstdint>
 #include <iostream>

--- a/src/algorithms/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/libs/gnss_sdr_valve.cc
@@ -31,11 +31,11 @@
 */

 #include "gnss_sdr_valve.h"
-#include <algorithm> // for min
-#include <cstring>  // for memcpy
-#include <gnuradio/io_signature.h>
 #include "control_message_factory.h"
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <algorithm> // for min
+#include <cstring>  // for memcpy

 gnss_sdr_valve::gnss_sdr_valve (size_t sizeof_stream_item,
        unsigned long long nitems,
--- a/src/algorithms/libs/gnss_signal_processing.cc
+++ b/src/algorithms/libs/gnss_signal_processing.cc
@@ -32,8 +32,8 @@
 */

 #include "gnss_signal_processing.h"
-#include <gnuradio/fxpt_nco.h>
 #include "GPS_L1_CA.h"
+#include <gnuradio/fxpt_nco.h>


 auto auxCeil2 = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };
--- a/src/algorithms/libs/gps_l2c_signal.cc
+++ b/src/algorithms/libs/gps_l2c_signal.cc
@@ -30,10 +30,10 @@
 * -------------------------------------------------------------------------
 */

-#include <gps_l2c_signal.h>
+#include "gps_l2c_signal.h"
+#include "GPS_L2C.h"
 #include <cstdint>
 #include <cmath>
-#include "GPS_L2C.h"


 int32_t gps_l2c_m_shift(int32_t x)
--- a/src/algorithms/libs/gps_l5_signal.cc
+++ b/src/algorithms/libs/gps_l5_signal.cc
@@ -30,12 +30,12 @@
 * -------------------------------------------------------------------------
 */

-#include <iostream>
-#include <deque>
-#include <cmath>
-#include <cinttypes>
-#include <complex>
+#include "gps_l5_signal.h"
 #include "GPS_L5.h"
+#include <cinttypes>
+#include <cmath>
+#include <complex>
+#include <deque>


 std::deque<bool> l5i_xa_shift(std::deque<bool> xa)
--- a/src/algorithms/libs/pass_through.cc
+++ b/src/algorithms/libs/pass_through.cc
@@ -31,11 +31,10 @@
 */

 #include "pass_through.h"
-#include <iostream>
-#include <complex>
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+#include <complex>

 using google::LogMessage;

--- a/src/algorithms/libs/pass_through.h
+++ b/src/algorithms/libs/pass_through.h
@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_PASS_THROUGH_H_
 #define GNSS_SDR_PASS_THROUGH_H_

-#include <string>
-#include <gnuradio/hier_block2.h>
-#include <gnuradio/blocks/copy.h>
-#include "gnss_block_interface.h"
 #include "conjugate_cc.h"
 #include "conjugate_sc.h"
 #include "conjugate_ic.h"
+#include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/blocks/copy.h>
+#include <string>


 class ConfigurationInterface;
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -53,6 +53,9 @@
 #ifndef GNSS_SDR_RTKLIB_H_
 #define GNSS_SDR_RTKLIB_H_

+#include "MATH_CONSTANTS.h"
+#include "gnss_frequencies.h"
+#include "gnss_obs_codes.h"
 #include <pthread.h>
 #include <netinet/in.h>
 #include <cctype>
@@ -60,9 +63,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
-#include "gnss_obs_codes.h"


 /* macros --------------------------------------------------------------------*/
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
@@ -20,11 +20,11 @@
 #include <config.h>
 #endif

+#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
+#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 #include <volk_gnsssdr/constants.h>      // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ...
 #include <iostream>                      // for operator<<, endl, cout, ostream
 #include <string>                        // for string
-#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
-#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t

 void print_alignment()
 {
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
@@ -16,23 +16,23 @@
 * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
 */

-
+#include "kernel_tests.h"                      // for init_test_list
+#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
+#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
+#include "volk_gnsssdr_profile.h"
+#include "volk_gnsssdr/volk_gnsssdr_prefs.h"   // for volk_gnsssdr_get_config_path
+#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+#include <boost/filesystem/path.hpp>           // for path, operator<<
+#include <boost/filesystem/path_traits.hpp>    // for filesystem
 #include <sys/stat.h>                          // for stat
 #include <cstddef>                             // for size_t
 #include <iostream>                            // for operator<<, basic_ostream
 #include <fstream>                             // IWYU pragma: keep
 #include <map>                                 // for map, map<>::iterator
 #include <utility>                             // for pair
-#include <vector>                              // for vector, vector<>::const_...
-#include <boost/filesystem/operations.hpp>     // for create_directories, exists
-#include <boost/filesystem/path.hpp>           // for path, operator<<
-#include <boost/filesystem/path_traits.hpp>    // for filesystem
-#include <volk_gnsssdr/volk_gnsssdr_prefs.h>   // for volk_gnsssdr_get_config_path
-#include "kernel_tests.h"                      // for init_test_list
-#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
-#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
-#include "volk_gnsssdr_profile.h"
+#include <vector>                              // for vector, vector<>::const_..
+


 namespace fs = boost::filesystem;
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
@@ -17,6 +17,13 @@
 */

 #include "qa_utils.h"
+#include "volk_gnsssdr/volk_gnsssdr.h"              // for volk_gnsssdr_func_desc_t
+#include "volk_gnsssdr/volk_gnsssdr_malloc.h"       // for volk_gnsssdr_free, volk_gnsssdr_malloc
+#include <boost/foreach.hpp>                        // for auto_any_base
+#include <boost/lexical_cast.hpp>                   // for lexical_cast
+#include <boost/token_functions.hpp>                // for char_separator
+#include <boost/token_iterator.hpp>                 // for token_iterator
+#include <boost/tokenizer.hpp>                      // for tokenizer
 #include <cassert>                                  // for assert
 #include <chrono>                                   // for system_clock, duration,...
 #include <cmath>                                    // for sqrt, fabs, abs
@@ -28,13 +35,6 @@
 #include <map>                                      // for map
 #include <random>                                   // for random_device, default_random_engine, uniform_real_distribution
 #include <vector>                                   // for vector
-#include <boost/foreach.hpp>                        // for auto_any_base
-#include <boost/lexical_cast.hpp>                   // for lexical_cast
-#include <boost/token_functions.hpp>                // for char_separator
-#include <boost/token_iterator.hpp>                 // for token_iterator
-#include <boost/tokenizer.hpp>                      // for tokenizer
-#include <volk_gnsssdr/volk_gnsssdr.h>              // for volk_gnsssdr_func_desc_t
-#include <volk_gnsssdr/volk_gnsssdr_malloc.h>       // for volk_gnsssdr_free, volk_gnsssdr_malloc


 float uniform() {
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
@@ -23,13 +23,13 @@
 #define _DARWIN_C_SOURCE
 #endif

+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
+#include "volk_gnsssdr/volk_gnsssdr.h"          // for volk_gnsssdr_func_desc_t
 #include <cstdbool>       // for bool, false
 #include <cstdlib>        // for NULL
 #include <map>            // for map
 #include <string>         // for string, basic_string
 #include <vector>         // for vector
-#include <volk_gnsssdr/volk_gnsssdr.h>          // for volk_gnsssdr_func_desc_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t


 /************************************************
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
@@ -18,6 +18,9 @@
 */


+#include "kernel_tests.h"       // for init_test_list
+#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 #include <cstdbool>             // for bool, false, true
 #include <iostream>             // for operator<<, basic_ostream, endl, char...
 #include <fstream>              // IWYU pragma: keep
@@ -25,9 +28,6 @@
 #include <string>               // for string, operator<<
 #include <utility>              // for pair
 #include <vector>               // for vector
-#include "kernel_tests.h"       // for init_test_list
-#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t

 void print_qa_xml(std::vector<volk_gnsssdr_test_results_t> results, unsigned int nfails);