From e74b72b9dff6094da56997a0f4d1ed6ff4bc4617 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 29 Apr 2018 04:16:56 +0200
Subject: [PATCH] Reorder includes

---
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc      | 15 ++++++-------
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h       | 11 +++++-----
 .../gps_l1_ca_tcp_connector_tracking_cc.cc    | 22 +++++++++----------
 .../gps_l1_ca_tcp_connector_tracking_cc.h     |  8 +++----
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
index f39448ce3..e1f0c31c3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
@@ -29,21 +29,20 @@
  */
 
 #include "gps_l1_ca_dll_pll_tracking_gpu_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "GPS_L1_CA.h"
 #include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
-// includes
+#include <boost/lexical_cast.hpp>
 #include <cuda_profiler_api.h>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git 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
index 2743f5c99..be8959f49 100644
--- 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
@@ -36,14 +36,15 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_CC_H
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_CC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
+#include "cuda_multicorrelator.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
-#include "cuda_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
+
 
 class Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 1eb6e960a..a650238cc 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -36,22 +36,22 @@
  */
 
 #include "gps_l1_ca_tcp_connector_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <sstream>
+#include "control_message_factory.h"
+#include "gnss_sdr_flags.h"
+#include "gps_sdr_signal_processing.h"
+#include "GPS_L1_CA.h"
+#include "lock_detectors.h"
+#include "tcp_communication.h"
+#include "tcp_packet_data.h"
+#include "tracking_discriminators.h"
 #include <boost/asio.hpp>
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "gps_sdr_signal_processing.h"
-#include "tracking_discriminators.h"
-#include "lock_detectors.h"
-#include "GPS_L1_CA.h"
-#include "control_message_factory.h"
-#include "gnss_sdr_flags.h"
-#include "tcp_communication.h"
-#include "tcp_packet_data.h"
+#include <cmath>
+#include <iostream>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git 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
index 89140e4b6..21bf6f02c 100644
--- 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
@@ -37,13 +37,13 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H
 #define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H
 
+#include "cpu_multicorrelator.h"
+#include "gnss_synchro.h"
+#include "tcp_communication.h"
+#include <gnuradio/block.h>
 #include <fstream>
 #include <map>
 #include <string>
-#include <gnuradio/block.h>
-#include "gnss_synchro.h"
-#include "cpu_multicorrelator.h"
-#include "tcp_communication.h"
 
 
 class Gps_L1_Ca_Tcp_Connector_Tracking_cc;