bds b1i: Merging latest changes from upstream/next

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc

@@ -34,23 +34,20 @@
  * -------------------------------------------------------------------------
  */
 
-#include "dll_pll_conf.h"
 #include "galileo_e1_dll_pll_veml_tracking.h"
-#include "configuration_interface.h"
 #include "Galileo_E1.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GalileoE1DllPllVemlTracking::stop_tracking()
-{
-}
 
 GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf trk_param = Dll_Pll_Conf();
@@ -133,7 +130,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = dll_pll_veml_make_tracking(trk_param);
@@ -157,7 +154,10 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
 }
 
 
-GalileoE1DllPllVemlTracking::~GalileoE1DllPllVemlTracking()
+GalileoE1DllPllVemlTracking::~GalileoE1DllPllVemlTracking() = default;
+
+
+void GalileoE1DllPllVemlTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h

@@ -37,8 +37,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
 #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking.h"
+#include "tracking_interface.h"
 #include <string>
 
 
@@ -52,7 +52,7 @@ class GalileoE1DllPllVemlTracking : public TrackingInterface
 {
 public:
     GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc

@@ -35,11 +35,11 @@
  */
 
 #include "galileo_e1_dll_pll_veml_tracking_fpga.h"
-#include "configuration_interface.h"
 #include "Galileo_E1.h"
+#include "configuration_interface.h"
+#include "display.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
-#include "display.h"
 #include <glog/logging.h>
 
 //#define NUM_PRNs_GALILEO_E1 50
@@ -51,7 +51,7 @@ void GalileoE1DllPllVemlTrackingFpga::stop_tracking()
 }
 
 GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     //dllpllconf_t trk_param;

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h

@@ -37,8 +37,8 @@
 #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_FPGA_H_
 #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_FPGA_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking_fpga.h"
+#include "tracking_interface.h"
 #include <string>
 
 
@@ -52,7 +52,7 @@ class GalileoE1DllPllVemlTrackingFpga : public TrackingInterface
 {
 public:
     GalileoE1DllPllVemlTrackingFpga(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc

@@ -36,21 +36,19 @@
  */
 
 #include "galileo_e1_tcp_connector_tracking.h"
-#include <glog/logging.h>
 #include "Galileo_E1.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
-void GalileoE1TcpConnectorTracking::stop_tracking()
-{
-}
 
 GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
-    ConfigurationInterface* configuration, std::string role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, const std::string& role,
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
@@ -81,7 +79,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = galileo_e1_tcp_connector_make_tracking_cc(
@@ -113,7 +111,10 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
 }
 
 
-GalileoE1TcpConnectorTracking::~GalileoE1TcpConnectorTracking()
+GalileoE1TcpConnectorTracking::~GalileoE1TcpConnectorTracking() = default;
+
+
+void GalileoE1TcpConnectorTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h

@@ -39,9 +39,9 @@
 #ifndef GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_
 #define GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_
 
-#include <string>
-#include "tracking_interface.h"
 #include "galileo_e1_tcp_connector_tracking_cc.h"
+#include "tracking_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;
@@ -53,7 +53,7 @@ class GalileoE1TcpConnectorTracking : public TrackingInterface
 {
 public:
     GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc

@@ -35,22 +35,19 @@
  *
  * -------------------------------------------------------------------------
  */
-#include "dll_pll_conf.h"
 #include "galileo_e5a_dll_pll_tracking.h"
-#include "configuration_interface.h"
 #include "Galileo_E5a.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 using google::LogMessage;
 
-void GalileoE5aDllPllTracking::stop_tracking()
-{
-}
 
 GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf trk_param = Dll_Pll_Conf();
@@ -131,7 +128,7 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = dll_pll_veml_make_tracking(trk_param);
@@ -154,7 +151,10 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
 }
 
 
-GalileoE5aDllPllTracking::~GalileoE5aDllPllTracking()
+GalileoE5aDllPllTracking::~GalileoE5aDllPllTracking() = default;
+
+
+void GalileoE5aDllPllTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h

@@ -39,8 +39,8 @@
 #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -52,7 +52,7 @@ class GalileoE5aDllPllTracking : public TrackingInterface
 {
 public:
     GalileoE5aDllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc

@@ -37,11 +37,11 @@
  */
 
 #include "galileo_e5a_dll_pll_tracking_fpga.h"
-#include "configuration_interface.h"
 #include "Galileo_E5a.h"
+#include "configuration_interface.h"
+#include "display.h"
 #include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_flags.h"
-#include "display.h"
 #include <glog/logging.h>
 
 using google::LogMessage;
@@ -51,7 +51,7 @@ void GalileoE5aDllPllTrackingFpga::stop_tracking()
 }
 
 GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
-    ConfigurationInterface *configuration, std::string role,
+    ConfigurationInterface *configuration, const std::string &role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     //printf("creating the E5A tracking");
@@ -136,9 +136,9 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
 
     //################# PRE-COMPUTE ALL THE CODES #################
     unsigned int code_samples_per_chip = 1;
-    unsigned int code_length_chips = static_cast<unsigned int>(Galileo_E5a_CODE_LENGTH_CHIPS);
+    auto code_length_chips = static_cast<unsigned int>(Galileo_E5a_CODE_LENGTH_CHIPS);
 
-    gr_complex *aux_code = static_cast<gr_complex *>(volk_gnsssdr_malloc(sizeof(gr_complex) * code_length_chips * code_samples_per_chip, volk_gnsssdr_get_alignment()));
+    auto *aux_code = static_cast<gr_complex *>(volk_gnsssdr_malloc(sizeof(gr_complex) * code_length_chips * code_samples_per_chip, volk_gnsssdr_get_alignment()));
 
     float *tracking_code;
     float *data_code;

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h

@@ -39,8 +39,8 @@
 #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_FPGA_H_
 #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_FPGA_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking_fpga.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -52,7 +52,7 @@ class GalileoE5aDllPllTrackingFpga : public TrackingInterface
 {
 public:
     GalileoE5aDllPllTrackingFpga(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc

@@ -38,20 +38,17 @@
  */
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking.h"
+#include "GLONASS_L1_L2_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include "GLONASS_L1_L2_CA.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GlonassL1CaDllPllCAidTracking::stop_tracking()
-{
-}
 
 GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -86,7 +83,7 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
     vector_length = std::round(fs_in / (GLONASS_L1_CA_CODE_RATE_HZ / GLONASS_L1_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_cc = glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
@@ -102,7 +99,7 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
                 early_late_space_chips);
             DLOG(INFO) << "tracking(" << tracking_cc->unique_id() << ")";
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             item_size_ = sizeof(lv_16sc_t);
             tracking_sc = glonass_l1_ca_dll_pll_c_aid_make_tracking_sc(
@@ -135,18 +132,21 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
 }
 
 
-GlonassL1CaDllPllCAidTracking::~GlonassL1CaDllPllCAidTracking()
+GlonassL1CaDllPllCAidTracking::~GlonassL1CaDllPllCAidTracking() = default;
+
+
+void GlonassL1CaDllPllCAidTracking::stop_tracking()
 {
 }
 
 
 void GlonassL1CaDllPllCAidTracking::start_tracking()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->start_tracking();
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->start_tracking();
         }
@@ -164,11 +164,11 @@ void GlonassL1CaDllPllCAidTracking::set_channel(unsigned int channel)
 {
     channel_ = channel;
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_channel(channel);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_channel(channel);
         }
@@ -181,11 +181,11 @@ void GlonassL1CaDllPllCAidTracking::set_channel(unsigned int channel)
 
 void GlonassL1CaDllPllCAidTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_gnss_synchro(p_gnss_synchro);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_gnss_synchro(p_gnss_synchro);
         }
@@ -216,35 +216,31 @@ void GlonassL1CaDllPllCAidTracking::disconnect(gr::top_block_sptr top_block)
 
 gr::basic_block_sptr GlonassL1CaDllPllCAidTracking::get_left_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }
 
 
 gr::basic_block_sptr GlonassL1CaDllPllCAidTracking::get_right_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+
+
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h

@@ -40,9 +40,9 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc

@@ -37,20 +37,17 @@
  */
 
 #include "glonass_l1_ca_dll_pll_tracking.h"
+#include "GLONASS_L1_L2_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include "GLONASS_L1_L2_CA.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GlonassL1CaDllPllTracking::stop_tracking()
-{
-}
 
 GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -78,7 +75,7 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking(
     vector_length = std::round(fs_in / (GLONASS_L1_CA_CODE_RATE_HZ / GLONASS_L1_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = glonass_l1_ca_dll_pll_make_tracking_cc(
@@ -108,7 +105,10 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking(
 }
 
 
-GlonassL1CaDllPllTracking::~GlonassL1CaDllPllTracking()
+GlonassL1CaDllPllTracking::~GlonassL1CaDllPllTracking() = default;
+
+
+void GlonassL1CaDllPllTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h

@@ -39,8 +39,8 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -52,7 +52,7 @@ class GlonassL1CaDllPllTracking : public TrackingInterface
 {
 public:
     GlonassL1CaDllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc

@@ -36,20 +36,17 @@
  */
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking.h"
-#include "configuration_interface.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GlonassL2CaDllPllCAidTracking::stop_tracking()
-{
-}
 
 GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -84,7 +81,7 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
     vector_length = std::round(fs_in / (GLONASS_L2_CA_CODE_RATE_HZ / GLONASS_L2_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_cc = glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
@@ -100,7 +97,7 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
                 early_late_space_chips);
             DLOG(INFO) << "tracking(" << tracking_cc->unique_id() << ")";
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             item_size_ = sizeof(lv_16sc_t);
             tracking_sc = glonass_l2_ca_dll_pll_c_aid_make_tracking_sc(
@@ -133,18 +130,21 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
 }
 
 
-GlonassL2CaDllPllCAidTracking::~GlonassL2CaDllPllCAidTracking()
+GlonassL2CaDllPllCAidTracking::~GlonassL2CaDllPllCAidTracking() = default;
+
+
+void GlonassL2CaDllPllCAidTracking::stop_tracking()
 {
 }
 
 
 void GlonassL2CaDllPllCAidTracking::start_tracking()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->start_tracking();
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->start_tracking();
         }
@@ -162,11 +162,11 @@ void GlonassL2CaDllPllCAidTracking::set_channel(unsigned int channel)
 {
     channel_ = channel;
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_channel(channel);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_channel(channel);
         }
@@ -179,11 +179,11 @@ void GlonassL2CaDllPllCAidTracking::set_channel(unsigned int channel)
 
 void GlonassL2CaDllPllCAidTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_gnss_synchro(p_gnss_synchro);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_gnss_synchro(p_gnss_synchro);
         }
@@ -214,35 +214,29 @@ void GlonassL2CaDllPllCAidTracking::disconnect(gr::top_block_sptr top_block)
 
 gr::basic_block_sptr GlonassL2CaDllPllCAidTracking::get_left_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }
 
 
 gr::basic_block_sptr GlonassL2CaDllPllCAidTracking::get_right_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h

@@ -38,9 +38,9 @@
 #ifndef GNSS_SDR_GLONASS_L2_CA_DLL_PLL_C_AID_TRACKING_H_
 #define GNSS_SDR_GLONASS_L2_CA_DLL_PLL_C_AID_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_cc.h"
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_sc.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -52,7 +52,7 @@ class GlonassL2CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc

@@ -35,20 +35,17 @@
  */
 
 #include "glonass_l2_ca_dll_pll_tracking.h"
-#include "configuration_interface.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GlonassL2CaDllPllTracking::stop_tracking()
-{
-}
 
 GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -76,7 +73,7 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking(
     vector_length = std::round(fs_in / (GLONASS_L2_CA_CODE_RATE_HZ / GLONASS_L2_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = glonass_l2_ca_dll_pll_make_tracking_cc(
@@ -106,7 +103,10 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking(
 }
 
 
-GlonassL2CaDllPllTracking::~GlonassL2CaDllPllTracking()
+GlonassL2CaDllPllTracking::~GlonassL2CaDllPllTracking() = default;
+
+
+void GlonassL2CaDllPllTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h

@@ -38,8 +38,8 @@
 #ifndef GNSS_SDR_GLONASS_L2_CA_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GLONASS_L2_CA_DLL_PLL_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "glonass_l2_ca_dll_pll_tracking_cc.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -51,7 +51,7 @@ class GlonassL2CaDllPllTracking : public TrackingInterface
 {
 public:
     GlonassL2CaDllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc

@@ -45,12 +45,9 @@
 
 using google::LogMessage;
 
-void GpsL1CaDllPllCAidTracking::stop_tracking()
-{
-}
 
 GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -85,7 +82,7 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
     vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_cc = gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
@@ -101,7 +98,7 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
                 early_late_space_chips);
             DLOG(INFO) << "tracking(" << tracking_cc->unique_id() << ")";
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             item_size_ = sizeof(lv_16sc_t);
             tracking_sc = gps_l1_ca_dll_pll_c_aid_make_tracking_sc(
@@ -134,18 +131,21 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
 }
 
 
-GpsL1CaDllPllCAidTracking::~GpsL1CaDllPllCAidTracking()
+GpsL1CaDllPllCAidTracking::~GpsL1CaDllPllCAidTracking() = default;
+
+
+void GpsL1CaDllPllCAidTracking::stop_tracking()
 {
 }
 
 
 void GpsL1CaDllPllCAidTracking::start_tracking()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->start_tracking();
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->start_tracking();
         }
@@ -162,11 +162,11 @@ void GpsL1CaDllPllCAidTracking::set_channel(unsigned int channel)
 {
     channel_ = channel;
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_channel(channel);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_channel(channel);
         }
@@ -178,11 +178,11 @@ void GpsL1CaDllPllCAidTracking::set_channel(unsigned int channel)
 
 void GpsL1CaDllPllCAidTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             tracking_cc->set_gnss_synchro(p_gnss_synchro);
         }
-    else if (item_type_.compare("cshort") == 0)
+    else if (item_type_ == "cshort")
         {
             tracking_sc->set_gnss_synchro(p_gnss_synchro);
         }
@@ -210,34 +210,28 @@ void GpsL1CaDllPllCAidTracking::disconnect(gr::top_block_sptr top_block)
 
 gr::basic_block_sptr GpsL1CaDllPllCAidTracking::get_left_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }
 
 gr::basic_block_sptr GpsL1CaDllPllCAidTracking::get_right_block()
 {
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             return tracking_cc;
         }
-    else if (item_type_.compare("cshort") == 0)
+    if (item_type_ == "cshort")
         {
             return tracking_sc;
         }
-    else
-        {
-            LOG(WARNING) << item_type_ << " unknown tracking item type";
-            return nullptr;
-        }
+    LOG(WARNING) << item_type_ << " unknown tracking item type";
+    return nullptr;
 }

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h

@@ -38,9 +38,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
+#include "tracking_interface.h"
 #include <string>
 
 
@@ -53,7 +53,7 @@ class GpsL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc

@@ -35,23 +35,19 @@
  * -------------------------------------------------------------------------
  */
 
-#include "dll_pll_conf.h"
 #include "gps_l1_ca_dll_pll_tracking.h"
-#include "configuration_interface.h"
 #include "GPS_L1_CA.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 using google::LogMessage;
 
-void GpsL1CaDllPllTracking::stop_tracking()
-{
-    tracking_->stop_tracking();
-}
 
 GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf trk_param = Dll_Pll_Conf();
@@ -136,7 +132,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = dll_pll_veml_make_tracking(trk_param);
@@ -159,8 +155,12 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
 }
 
 
-GpsL1CaDllPllTracking::~GpsL1CaDllPllTracking()
+GpsL1CaDllPllTracking::~GpsL1CaDllPllTracking() = default;
+
+
+void GpsL1CaDllPllTracking::stop_tracking()
 {
+    tracking_->stop_tracking();
 }
 
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h

@@ -38,8 +38,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -51,7 +51,7 @@ class GpsL1CaDllPllTracking : public TrackingInterface
 {
 public:
     GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc

@@ -36,13 +36,13 @@
  * -------------------------------------------------------------------------
  */
 
-#include <glog/logging.h>
-#include "gps_sdr_signal_processing.h"
 #include "gps_l1_ca_dll_pll_tracking_fpga.h"
-#include "configuration_interface.h"
 #include "GPS_L1_CA.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "gnss_sdr_flags.h"
+#include "gps_sdr_signal_processing.h"
+#include <glog/logging.h>
 
 #define NUM_PRNs 32
 
@@ -53,7 +53,7 @@ void GpsL1CaDllPllTrackingFpga::stop_tracking()
 }
 
 GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf_Fpga trk_param_fpga = Dll_Pll_Conf_Fpga();

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h

@@ -39,9 +39,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_FPGA_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_FPGA_H_
 
-#include <string>
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking_fpga.h"
+#include "tracking_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;
@@ -53,7 +53,7 @@ class GpsL1CaDllPllTrackingFpga : public TrackingInterface
 {
 public:
     GpsL1CaDllPllTrackingFpga(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc

@@ -36,10 +36,10 @@
 
 
 #include "gps_l1_ca_dll_pll_tracking_gpu.h"
-#include <glog/logging.h>
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h

@@ -37,9 +37,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_H_
 
-#include <string>
-#include "tracking_interface.h"
 #include "gps_l1_ca_dll_pll_tracking_gpu_cc.h"
+#include "tracking_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;

src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc

@@ -39,20 +39,17 @@
 
 
 #include "gps_l1_ca_kf_tracking.h"
-#include "gnss_sdr_flags.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GpsL1CaKfTracking::stop_tracking()
-{
-}
 
 GpsL1CaKfTracking::GpsL1CaKfTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
@@ -93,7 +90,7 @@ GpsL1CaKfTracking::GpsL1CaKfTracking(
     bce_kappa = configuration->property(role + ".bce_kappa", 0);
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = gps_l1_ca_kf_make_tracking_cc(
@@ -121,7 +118,10 @@ GpsL1CaKfTracking::GpsL1CaKfTracking(
 }
 
 
-GpsL1CaKfTracking::~GpsL1CaKfTracking()
+GpsL1CaKfTracking::~GpsL1CaKfTracking() = default;
+
+
+void GpsL1CaKfTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h

@@ -53,7 +53,7 @@ class GpsL1CaKfTracking : public TrackingInterface
 {
 public:
     GpsL1CaKfTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc

@@ -36,20 +36,18 @@
  */
 
 #include "gps_l1_ca_tcp_connector_tracking.h"
-#include <glog/logging.h>
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
-void GpsL1CaTcpConnectorTracking::stop_tracking()
-{
-}
 
 GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
-    ConfigurationInterface* configuration, std::string role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, const std::string& role,
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
@@ -73,7 +71,7 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
     vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = gps_l1_ca_tcp_connector_make_tracking_cc(
@@ -103,7 +101,10 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
 }
 
 
-GpsL1CaTcpConnectorTracking::~GpsL1CaTcpConnectorTracking()
+GpsL1CaTcpConnectorTracking::~GpsL1CaTcpConnectorTracking() = default;
+
+
+void GpsL1CaTcpConnectorTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h

@@ -38,9 +38,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_
 #define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_
 
-#include <string>
-#include "tracking_interface.h"
 #include "gps_l1_ca_tcp_connector_tracking_cc.h"
+#include "tracking_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;
@@ -52,7 +52,7 @@ class GpsL1CaTcpConnectorTracking : public TrackingInterface
 {
 public:
     GpsL1CaTcpConnectorTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc

@@ -34,23 +34,20 @@
  * -------------------------------------------------------------------------
  */
 
-#include "dll_pll_conf.h"
 #include "gps_l2_m_dll_pll_tracking.h"
-#include "configuration_interface.h"
 #include "GPS_L2C.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GpsL2MDllPllTracking::stop_tracking()
-{
-}
 
 GpsL2MDllPllTracking::GpsL2MDllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf trk_param = Dll_Pll_Conf();
@@ -112,7 +109,7 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = dll_pll_veml_make_tracking(trk_param);
@@ -135,11 +132,13 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
 }
 
 
-GpsL2MDllPllTracking::~GpsL2MDllPllTracking()
+GpsL2MDllPllTracking::~GpsL2MDllPllTracking() = default;
+
+
+void GpsL2MDllPllTracking::stop_tracking()
 {
 }
 
-
 void GpsL2MDllPllTracking::start_tracking()
 {
     tracking_->start_tracking();

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h

@@ -38,8 +38,8 @@
 #ifndef GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
 #define GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -51,7 +51,7 @@ class GpsL2MDllPllTracking : public TrackingInterface
 {
 public:
     GpsL2MDllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc

@@ -36,11 +36,11 @@
 
 
 #include "gps_l2_m_dll_pll_tracking_fpga.h"
-#include "configuration_interface.h"
 #include "GPS_L2C.h"
-#include "gps_l2c_signal.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "gnss_sdr_flags.h"
+#include "gps_l2c_signal.h"
 #include <glog/logging.h>
 
 #define NUM_PRNs 32
@@ -52,7 +52,7 @@ void GpsL2MDllPllTrackingFpga::stop_tracking()
 }
 
 GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     //dllpllconf_t trk_param;
@@ -125,7 +125,7 @@ GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
 
     //d_tracking_code = static_cast<float *>(volk_gnsssdr_malloc(2 * static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * sizeof(float), volk_gnsssdr_get_alignment()));
     d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * NUM_PRNs * sizeof(int), volk_gnsssdr_get_alignment()));
-    float* ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * sizeof(float), volk_gnsssdr_get_alignment()));
+    auto* ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * sizeof(float), volk_gnsssdr_get_alignment()));
 
     //################# PRE-COMPUTE ALL THE CODES #################
     d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<int>(GPS_L2_M_CODE_LENGTH_CHIPS * NUM_PRNs) * sizeof(int), volk_gnsssdr_get_alignment()));
@@ -167,9 +167,7 @@ GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
 }
 
 
-GpsL2MDllPllTrackingFpga::~GpsL2MDllPllTrackingFpga()
-{
-}
+GpsL2MDllPllTrackingFpga::~GpsL2MDllPllTrackingFpga() = default;
 
 
 void GpsL2MDllPllTrackingFpga::start_tracking()

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h

@@ -52,7 +52,7 @@ class GpsL2MDllPllTrackingFpga : public TrackingInterface
 {
 public:
     GpsL2MDllPllTrackingFpga(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc

@@ -34,23 +34,20 @@
  * -------------------------------------------------------------------------
  */
 
-#include "dll_pll_conf.h"
 #include "gps_l5_dll_pll_tracking.h"
-#include "configuration_interface.h"
 #include "GPS_L5.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "dll_pll_conf.h"
+#include "gnss_sdr_flags.h"
 #include <glog/logging.h>
 
 
 using google::LogMessage;
 
-void GpsL5DllPllTracking::stop_tracking()
-{
-}
 
 GpsL5DllPllTracking::GpsL5DllPllTracking(
-    ConfigurationInterface* configuration, std::string role,
+    ConfigurationInterface* configuration, const std::string& role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     Dll_Pll_Conf trk_param = Dll_Pll_Conf();
@@ -131,7 +128,7 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
-    if (item_type.compare("gr_complex") == 0)
+    if (item_type == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             tracking_ = dll_pll_veml_make_tracking(trk_param);
@@ -154,7 +151,10 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
 }
 
 
-GpsL5DllPllTracking::~GpsL5DllPllTracking()
+GpsL5DllPllTracking::~GpsL5DllPllTracking() = default;
+
+
+void GpsL5DllPllTracking::stop_tracking()
 {
 }
 

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h

@@ -37,8 +37,8 @@
 #ifndef GNSS_SDR_GPS_L5_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GPS_L5_DLL_PLL_TRACKING_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -50,7 +50,7 @@ class GpsL5DllPllTracking : public TrackingInterface
 {
 public:
     GpsL5DllPllTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc

@@ -36,11 +36,11 @@
 
 
 #include "gps_l5_dll_pll_tracking_fpga.h"
-#include "configuration_interface.h"
 #include "GPS_L5.h"
-#include "gps_l5_signal.h"
-#include "gnss_sdr_flags.h"
+#include "configuration_interface.h"
 #include "display.h"
+#include "gnss_sdr_flags.h"
+#include "gps_l5_signal.h"
 #include <glog/logging.h>
 
 #define NUM_PRNs 32
@@ -52,7 +52,7 @@ void GpsL5DllPllTrackingFpga::stop_tracking()
 }
 
 GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
-    ConfigurationInterface *configuration, std::string role,
+    ConfigurationInterface *configuration, const std::string &role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     //printf("L5 TRK CLASS CREATED\n");
@@ -136,7 +136,7 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
 
     //################# PRE-COMPUTE ALL THE CODES #################
     unsigned int code_samples_per_chip = 1;
-    unsigned int code_length_chips = static_cast<unsigned int>(GPS_L5i_CODE_LENGTH_CHIPS);
+    auto code_length_chips = static_cast<unsigned int>(GPS_L5i_CODE_LENGTH_CHIPS);
     //printf("TRK code_length_chips = %d\n", code_length_chips);
 
     float *tracking_code;

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h

@@ -37,8 +37,8 @@
 #ifndef GNSS_SDR_GPS_L5_DLL_PLL_TRACKING_FPGA_H_
 #define GNSS_SDR_GPS_L5_DLL_PLL_TRACKING_FPGA_H_
 
-#include "tracking_interface.h"
 #include "dll_pll_veml_tracking_fpga.h"
+#include "tracking_interface.h"
 #include <string>
 
 class ConfigurationInterface;
@@ -50,7 +50,7 @@ class GpsL5DllPllTrackingFpga : public TrackingInterface
 {
 public:
     GpsL5DllPllTrackingFpga(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);