From 122ec1962610151e8bf620b3cb1eb524131ab64f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carlesfernandez@gmail.com>
Date: Mon, 21 Aug 2017 11:45:12 +0200
Subject: [PATCH] Make use of the inline keyword where appropriate

---
 src/algorithms/PVT/adapters/rtklib_pvt.h      | 11 ++---
 ...alileo_e1_pcps_8ms_ambiguous_acquisition.h |  6 +--
 .../galileo_e1_pcps_ambiguous_acquisition.h   |  4 +-
 ...leo_e1_pcps_cccwsr_ambiguous_acquisition.h |  6 +--
 ..._e1_pcps_quicksync_ambiguous_acquisition.h |  6 +--
 ...lileo_e1_pcps_tong_ambiguous_acquisition.h |  6 +--
 ...lileo_e5a_noncoherent_iq_acquisition_caf.h |  6 +--
 .../adapters/gps_l1_ca_pcps_acquisition.h     |  6 +--
 .../gps_l1_ca_pcps_acquisition_fine_doppler.h |  6 +--
 .../gps_l1_ca_pcps_acquisition_fpga.h         |  6 +--
 .../gps_l1_ca_pcps_assisted_acquisition.h     |  6 +--
 .../gps_l1_ca_pcps_multithread_acquisition.h  |  6 +--
 .../gps_l1_ca_pcps_opencl_acquisition.h       |  6 +--
 .../gps_l1_ca_pcps_quicksync_acquisition.h    |  6 +--
 .../gps_l1_ca_pcps_tong_acquisition.h         |  6 +--
 .../adapters/gps_l2_m_pcps_acquisition.h      |  6 +--
 ...eo_e5a_noncoherent_iq_acquisition_caf_cc.h | 15 ++++---
 .../galileo_pcps_8ms_acquisition_cc.h         | 14 +++----
 .../gps_pcps_acquisition_fpga_sc.h            | 14 +++----
 .../gnuradio_blocks/pcps_acquisition_cc.h     | 16 ++++----
 .../pcps_acquisition_fine_doppler_cc.h        | 16 ++++----
 .../gnuradio_blocks/pcps_acquisition_sc.h     | 17 ++++----
 .../pcps_assisted_acquisition_cc.h            | 15 ++++---
 .../pcps_cccwsr_acquisition_cc.h              | 14 +++----
 .../pcps_multithread_acquisition_cc.h         | 14 +++----
 .../pcps_opencl_acquisition_cc.h              | 14 +++----
 .../pcps_quicksync_acquisition_cc.h           | 15 ++++---
 .../pcps_tong_acquisition_cc.h                | 15 ++++---
 src/algorithms/channel/adapters/channel.h     | 14 +++----
 .../adapters/array_signal_conditioner.h       | 12 +++---
 .../conditioner/adapters/signal_conditioner.h | 12 +++---
 .../adapters/byte_to_short.h                  |  7 ++--
 .../adapters/ibyte_to_cbyte.h                 |  6 +--
 .../adapters/ibyte_to_complex.h               |  8 ++--
 .../adapters/ibyte_to_cshort.h                |  7 ++--
 .../adapters/ishort_to_complex.h              |  7 ++--
 .../adapters/ishort_to_cshort.h               |  7 ++--
 .../input_filter/adapters/beamformer_filter.h |  6 +--
 .../input_filter/adapters/fir_filter.h        |  6 +--
 .../adapters/freq_xlating_fir_filter.h        |  6 +--
 .../adapters/pulse_blanking_filter.h          |  6 +--
 src/algorithms/libs/pass_through.h            | 24 ++++++-----
 .../observables/adapters/hybrid_observables.h |  8 ++--
 .../adapters/direct_resampler_conditioner.h   |  6 +--
 .../direct_resampler_conditioner_cb.h         | 10 ++---
 .../direct_resampler_conditioner_cc.h         |  7 +++-
 .../direct_resampler_conditioner_cs.h         | 10 ++---
 .../adapters/signal_generator.h               |  6 +--
 .../adapters/file_signal_source.h             | 20 ++++++----
 .../adapters/flexiband_signal_source.h        |  6 +--
 .../adapters/gen_signal_source.h              |  8 ++--
 .../adapters/gn3s_signal_source.h             |  6 +--
 .../adapters/nsr_file_signal_source.h         | 16 ++++----
 .../adapters/osmosdr_signal_source.h          |  6 +--
 .../adapters/raw_array_signal_source.h        |  6 +--
 .../adapters/rtl_tcp_signal_source.h          |  6 +--
 .../adapters/spir_file_signal_source.h        | 16 ++++----
 .../adapters/two_bit_cpx_file_signal_source.h | 16 ++++----
 .../two_bit_packed_file_signal_source.h       | 25 ++++++------
 .../adapters/uhd_signal_source.h              |  6 +--
 .../adapters/galileo_e1b_telemetry_decoder.h  | 10 ++---
 .../adapters/galileo_e5a_telemetry_decoder.h  | 10 ++---
 .../adapters/gps_l1_ca_telemetry_decoder.h    | 11 ++---
 .../adapters/gps_l2c_telemetry_decoder.h      | 10 ++---
 .../adapters/sbas_l1_telemetry_decoder.h      | 10 ++---
 .../telemetry_decoder/libs/convolutional.h    | 13 +++---
 .../galileo_e1_dll_pll_veml_tracking.h        |  8 ++--
 .../galileo_e1_tcp_connector_tracking.h       |  6 +--
 .../adapters/galileo_e5a_dll_pll_tracking.h   |  6 +--
 .../gps_l1_ca_dll_pll_c_aid_tracking.h        |  8 ++--
 .../gps_l1_ca_dll_pll_c_aid_tracking_fpga.h   |  8 ++--
 .../adapters/gps_l1_ca_dll_pll_tracking.h     |  8 ++--
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.h |  9 +++--
 .../gps_l1_ca_tcp_connector_tracking.h        | 11 ++---
 .../adapters/gps_l2_m_dll_pll_tracking.h      |  8 ++--
 .../system_parameters/galileo_ephemeris.h     |  4 +-
 .../system_parameters/gps_cnav_ephemeris.h    |  2 +-
 src/core/system_parameters/gps_cnav_iono.h    |  2 +-
 .../system_parameters/gps_cnav_utc_model.h    |  2 +-
 src/core/system_parameters/gps_ephemeris.h    |  3 +-
 src/core/system_parameters/gps_iono.h         |  2 +-
 src/core/system_parameters/gps_ref_location.h |  2 +-
 src/core/system_parameters/gps_ref_time.h     |  2 +-
 src/core/system_parameters/gps_utc_model.h    |  2 +-
 src/core/system_parameters/rtcm.h             | 40 +++++++++----------
 85 files changed, 387 insertions(+), 400 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h
index 242d73743..f37515323 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.h
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.h
@@ -53,13 +53,13 @@ public:
 
     virtual ~RtklibPvt();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //!  Returns "RTKLIB_Pvt"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "RTKLIB_PVT";
     }
@@ -69,28 +69,25 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
 
     //! All blocks must have an item_size() function implementation. Returns sizeof(gr_complex)
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return sizeof(gr_complex);
     }
 
 private:
     rtklib_pvt_cc_sptr pvt_;
-
     rtk_t rtk;
-
     bool dump_;
     std::string dump_filename_;
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-
     std::string eph_xml_filename_;
     bool save_assistance_to_XML();
 };
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h
index 66e3ad2da..90e9d3488 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~GalileoE1Pcps8msAmbiguousAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,12 +62,12 @@ public:
     /*!
      * \brief Returns "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
index aa6b08244..3874e4df9 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
@@ -58,7 +58,7 @@ public:
 
     virtual ~GalileoE1PcpsAmbiguousAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -66,7 +66,7 @@ public:
     /*!
      * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_PCPS_Ambiguous_Acquisition";
     }
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
index d2aaf0ae2..1ae47ea54 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,12 +62,12 @@ public:
     /*!
      * \brief Returns "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h
index 389899988..0e64dbf96 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,12 +62,12 @@ public:
     /*!
      * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h
index e249da597..78f033572 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~GalileoE1PcpsTongAmbiguousAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,12 +62,12 @@ public:
     /*!
      * \brief Returns "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
index ac91d3394..ce23d5441 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
@@ -55,7 +55,7 @@ public:
 
     virtual ~GalileoE5aNoncoherentIQAcquisitionCaf();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -63,12 +63,12 @@ public:
     /*!
      * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
index 0352b6b5a..0ff27c87f 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
@@ -63,7 +63,7 @@ public:
 
     virtual ~GpsL1CaPcpsAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -71,12 +71,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git 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
index 89b3160ec..4d1474a10 100644
--- 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
@@ -56,7 +56,7 @@ public:
 
     virtual ~GpsL1CaPcpsAcquisitionFineDoppler();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -64,12 +64,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
index 67c77a154..3a6115e6e 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
@@ -58,7 +58,7 @@ public:
 
     virtual ~GpsL1CaPcpsAcquisitionFpga();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -66,12 +66,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Acquisition_Fpga";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
index b5fc81791..ee7ac9b66 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
@@ -56,7 +56,7 @@ public:
 
     virtual ~GpsL1CaPcpsAssistedAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -64,12 +64,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Assisted_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Assisted_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h
index c00d21d9c..210fe0749 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h
@@ -55,7 +55,7 @@ public:
 
     virtual ~GpsL1CaPcpsMultithreadAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -63,12 +63,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Multithread_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Multithread_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h
index 325720f5a..606926155 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h
@@ -55,7 +55,7 @@ public:
 
     virtual ~GpsL1CaPcpsOpenClAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -63,12 +63,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_OpenCl_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_OpenCl_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h
index 283c3bbaf..a43597ee8 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h
@@ -57,7 +57,7 @@ public:
 
     virtual ~GpsL1CaPcpsQuickSyncAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -65,12 +65,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_QuickSync_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_QuickSync_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h
index dc7946a16..957688bad 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~GpsL1CaPcpsTongAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,12 +62,12 @@ public:
     /*!
      * \brief Returns "GPS_L1_CA_PCPS_Tong_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_PCPS_Tong_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
index 38d64cd18..cbe2a09a1 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
@@ -61,7 +61,7 @@ public:
 
     virtual ~GpsL2MPcpsAcquisition();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -69,12 +69,12 @@ public:
     /*!
      * \brief Returns "GPS_L2_M_PCPS_Acquisition"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L2_M_PCPS_Acquisition";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git 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
index d4d3b31d4..ab44e54c7 100644
--- 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
@@ -162,7 +162,7 @@ public:
       * to exchange synchronization data between acquisition and tracking blocks.
       * \param p_gnss_synchro Satellite information shared by the processing blocks.
       */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          d_gnss_synchro = p_gnss_synchro;
      }
@@ -170,7 +170,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -191,7 +191,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          d_active = active;
      }
@@ -207,7 +207,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          d_channel = channel;
      }
@@ -217,7 +217,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          d_threshold = threshold;
      }
@@ -226,7 +226,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          d_doppler_max = doppler_max;
      }
@@ -235,12 +235,11 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          d_doppler_step = doppler_step;
      }
 
-
      /*!
       * \brief Parallel Code Phase Search Acquisition signal processing.
       */
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
index 332b91083..267a5f6cf 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@@ -116,7 +116,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -124,7 +124,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_mag;
     }
@@ -145,7 +145,7 @@ public:
      * active mode
      * \param active - bool that activates/deactivates the block.
      */
-    void set_active(bool active)
+    inline void set_active(bool active)
     {
         d_active = active;
     }
@@ -161,7 +161,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -171,7 +171,7 @@ public:
      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
      * Algorithm 1, for a definition of this threshold).
      */
-    void set_threshold(float threshold)
+    inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
@@ -180,7 +180,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_doppler_max = doppler_max;
     }
@@ -189,7 +189,7 @@ public:
      * \brief Set Doppler steps for the grid search
      * \param doppler_step - Frequency bin of the search grid [Hz].
      */
-    void set_doppler_step(unsigned int doppler_step)
+    inline void set_doppler_step(unsigned int doppler_step)
     {
         d_doppler_step = doppler_step;
     }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h b/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h
index 8e60689fd..561609109 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/gps_pcps_acquisition_fpga_sc.h
@@ -15,7 +15,7 @@
  *
  * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach", Birkha user, 2007. pp 81-84
+ * Approach", Birkhauser, 2007. pp 81-84
  *
  * \authors <ul>
  *          <li> Marc Majoral, 2017. mmajoral(at)cttc.cat
@@ -126,7 +126,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -134,7 +134,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_mag;
     }
@@ -168,7 +168,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -178,7 +178,7 @@ public:
      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
      * Algorithm 1, for a definition of this threshold).
      */
-    void set_threshold(float threshold)
+    inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
@@ -187,7 +187,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_doppler_max = doppler_max;
         acquisition_fpga_8sc->set_doppler_max(doppler_max);
@@ -197,7 +197,7 @@ public:
      * \brief Set Doppler steps for the grid search
      * \param doppler_step - Frequency bin of the search grid [Hz].
      */
-    void set_doppler_step(unsigned int doppler_step)
+    inline void set_doppler_step(unsigned int doppler_step)
     {
         d_doppler_step = doppler_step;
         acquisition_fpga_8sc->set_doppler_step(doppler_step);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
index 00a602fc4..07fcb32a9 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
@@ -14,7 +14,7 @@
  *
  * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach", Birkha user, 2007. pp 81-84
+ * Approach", Birkhauser, 2007. pp 81-84
  *
  * \authors <ul>
  *          <li> Javier Arribas, 2011. jarribas(at)cttc.es
@@ -143,7 +143,7 @@ public:
       * to exchange synchronization data between acquisition and tracking blocks.
       * \param p_gnss_synchro Satellite information shared by the processing blocks.
       */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_gnss_synchro = p_gnss_synchro;
@@ -152,7 +152,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -173,7 +173,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_active = active;
@@ -190,7 +190,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_channel = channel;
@@ -201,7 +201,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_threshold = threshold;
@@ -211,7 +211,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_doppler_max = doppler_max;
@@ -221,7 +221,7 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_doppler_step = doppler_step;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
index f5dbe6061..cd3d75e5f 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@@ -14,7 +14,7 @@
  *
  * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach", Birkha user, 2007. pp 81-84
+ * Approach", Birkhauser, 2007. pp 81-84
  *
  * \authors <ul>
  *          <li> Javier Arribas, 2013. jarribas(at)cttc.es
@@ -147,7 +147,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -155,7 +155,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_test_statistics;
     }
@@ -176,7 +176,7 @@ public:
      * active mode
      * \param active - bool that activates/deactivates the block.
      */
-    void set_active(bool active)
+    inline void set_active(bool active)
     {
         d_active = active;
     }
@@ -185,7 +185,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -195,7 +195,7 @@ public:
      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
      * Algorithm 1, for a definition of this threshold).
      */
-    void set_threshold(float threshold)
+    inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
@@ -204,7 +204,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_config_doppler_max = doppler_max;
     }
@@ -215,7 +215,6 @@ public:
      */
     void set_doppler_step(unsigned int doppler_step);
 
-
     /*!
      * \brief Parallel Code Phase Search Acquisition signal processing.
      */
@@ -224,7 +223,6 @@ public:
             gr_vector_void_star &output_items);
 
     void forecast (int noutput_items, gr_vector_int &ninput_items_required);
-
 };
 
 #endif /* pcps_acquisition_fine_doppler_cc*/
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h
index bc13941f3..1b3ab7bf6 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h
@@ -14,7 +14,7 @@
  *
  * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach", Birkha user, 2007. pp 81-84
+ * Approach", Birkhauser, 2007. pp 81-84
  *
  * \authors <ul>
  *          <li> Javier Arribas, 2011. jarribas(at)cttc.es
@@ -144,7 +144,7 @@ public:
       * to exchange synchronization data between acquisition and tracking blocks.
       * \param p_gnss_synchro Satellite information shared by the processing blocks.
       */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          d_gnss_synchro = p_gnss_synchro;
      }
@@ -152,7 +152,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -173,7 +173,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          d_active = active;
      }
@@ -189,7 +189,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          d_channel = channel;
      }
@@ -199,7 +199,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          d_threshold = threshold;
      }
@@ -208,7 +208,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          d_doppler_max = doppler_max;
      }
@@ -217,12 +217,11 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          d_doppler_step = doppler_step;
      }
 
-
      /*!
       * \brief Parallel Code Phase Search Acquisition signal processing.
       */
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
index d090c04e6..58409b753 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@@ -14,7 +14,7 @@
  *
  * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * "A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach", Birkha user, 2007. pp 81-84
+ * Approach", Birkhauser, 2007. pp 81-84
  *
  * \authors <ul>
  *          <li> Javier Arribas, 2013. jarribas(at)cttc.es
@@ -148,7 +148,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -156,7 +156,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_test_statistics;
     }
@@ -177,7 +177,7 @@ public:
      * active mode
      * \param active - bool that activates/deactivates the block.
      */
-    void set_active(bool active)
+    inline void set_active(bool active)
     {
         d_active = active;
     }
@@ -186,7 +186,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -196,7 +196,7 @@ public:
      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
      * Algorithm 1, for a definition of this threshold).
      */
-    void set_threshold(float threshold)
+    inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
@@ -205,7 +205,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_doppler_max = doppler_max;
     }
@@ -216,7 +216,6 @@ public:
      */
     void set_doppler_step(unsigned int doppler_step);
 
-
     /*!
      * \brief Parallel Code Phase Search Acquisition signal processing.
      */
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
index cc34f1abd..dad25665b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@@ -125,7 +125,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          d_gnss_synchro = p_gnss_synchro;
      }
@@ -133,7 +133,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -155,7 +155,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          d_active = active;
      }
@@ -171,7 +171,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          d_channel = channel;
      }
@@ -181,7 +181,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          d_threshold = threshold;
      }
@@ -190,7 +190,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          d_doppler_max = doppler_max;
      }
@@ -199,7 +199,7 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          d_doppler_step = doppler_step;
      }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
index 30c10d190..d0f5af944 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
@@ -99,7 +99,6 @@ private:
     void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift,
             int doppler_offset);
 
-
     long d_fs_in;
     long d_freq;
     int d_samples_per_ms;
@@ -149,7 +148,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -157,7 +156,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_mag;
     }
@@ -178,7 +177,7 @@ public:
      * active mode
      * \param active - bool that activates/deactivates the block.
      */
-    void set_active(bool active)
+    inline void set_active(bool active)
     {
         d_active = active;
     }
@@ -194,7 +193,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -213,7 +212,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_doppler_max = doppler_max;
     }
@@ -222,12 +221,11 @@ public:
      * \brief Set Doppler steps for the grid search
      * \param doppler_step - Frequency bin of the search grid [Hz].
      */
-    void set_doppler_step(unsigned int doppler_step)
+    inline void set_doppler_step(unsigned int doppler_step)
     {
         d_doppler_step = doppler_step;
     }
 
-
     /*!
      * \brief Parallel Code Phase Search Acquisition signal processing.
      */
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
index 33559cb3b..8d5a1fef0 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
@@ -175,7 +175,7 @@ public:
       * to exchange synchronization data between acquisition and tracking blocks.
       * \param p_gnss_synchro Satellite information shared by the processing blocks.
       */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          d_gnss_synchro = p_gnss_synchro;
      }
@@ -183,7 +183,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -204,7 +204,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          d_active = active;
      }
@@ -220,7 +220,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          d_channel = channel;
      }
@@ -230,7 +230,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          d_threshold = threshold;
      }
@@ -239,7 +239,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          d_doppler_max = doppler_max;
      }
@@ -248,7 +248,7 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          d_doppler_step = doppler_step;
      }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index 9538dffa4..1196e6821 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -161,7 +161,7 @@ public:
      * to exchange synchronization data between acquisition and tracking blocks.
      * \param p_gnss_synchro Satellite information shared by the processing blocks.
      */
-    void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+    inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
     {
         d_gnss_synchro = p_gnss_synchro;
     }
@@ -169,7 +169,7 @@ public:
     /*!
      * \brief Returns the maximum peak of grid search.
      */
-    unsigned int mag()
+    inline unsigned int mag() const
     {
         return d_mag;
     }
@@ -190,7 +190,7 @@ public:
      * active mode
      * \param active - bool that activates/deactivates the block.
      */
-    void set_active(bool active)
+    inline void set_active(bool active)
     {
         d_active = active;
     }
@@ -206,7 +206,7 @@ public:
      * \brief Set acquisition channel unique ID
      * \param channel - receiver channel.
      */
-    void set_channel(unsigned int channel)
+    inline void set_channel(unsigned int channel)
     {
         d_channel = channel;
     }
@@ -216,7 +216,7 @@ public:
      * \param threshold - Threshold for signal detection (check \ref Navitec2012,
      * Algorithm 1, for a definition of this threshold).
      */
-    void set_threshold(float threshold)
+    inline void set_threshold(float threshold)
     {
         d_threshold = threshold;
     }
@@ -225,7 +225,7 @@ public:
      * \brief Set maximum Doppler grid search
      * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
      */
-    void set_doppler_max(unsigned int doppler_max)
+    inline void set_doppler_max(unsigned int doppler_max)
     {
         d_doppler_max = doppler_max;
     }
@@ -234,12 +234,11 @@ public:
      * \brief Set Doppler steps for the grid search
      * \param doppler_step - Frequency bin of the search grid [Hz].
      */
-    void set_doppler_step(unsigned int doppler_step)
+    inline void set_doppler_step(unsigned int doppler_step)
     {
         d_doppler_step = doppler_step;
     }
 
-
     /*!
      * \brief Parallel Code Phase Search Acquisition signal processing.
      */
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index 03b20b372..7174f2a88 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -140,7 +140,7 @@ public:
       * to exchange synchronization data between acquisition and tracking blocks.
       * \param p_gnss_synchro Satellite information shared by the processing blocks.
       */
-     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
+     inline void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
      {
          d_gnss_synchro = p_gnss_synchro;
      }
@@ -148,7 +148,7 @@ public:
      /*!
       * \brief Returns the maximum peak of grid search.
       */
-     unsigned int mag()
+     inline unsigned int mag() const
      {
          return d_mag;
      }
@@ -169,7 +169,7 @@ public:
       * active mode
       * \param active - bool that activates/deactivates the block.
       */
-     void set_active(bool active)
+     inline void set_active(bool active)
      {
          d_active = active;
      }
@@ -185,7 +185,7 @@ public:
       * \brief Set acquisition channel unique ID
       * \param channel - receiver channel.
       */
-     void set_channel(unsigned int channel)
+     inline void set_channel(unsigned int channel)
      {
          d_channel = channel;
      }
@@ -195,7 +195,7 @@ public:
       * \param threshold - Threshold for signal detection (check \ref Navitec2012,
       * Algorithm 1, for a definition of this threshold).
       */
-     void set_threshold(float threshold)
+     inline void set_threshold(float threshold)
      {
          d_threshold = threshold;
      }
@@ -204,7 +204,7 @@ public:
       * \brief Set maximum Doppler grid search
       * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz].
       */
-     void set_doppler_max(unsigned int doppler_max)
+     inline void set_doppler_max(unsigned int doppler_max)
      {
          d_doppler_max = doppler_max;
      }
@@ -213,12 +213,11 @@ public:
       * \brief Set Doppler steps for the grid search
       * \param doppler_step - Frequency bin of the search grid [Hz].
       */
-     void set_doppler_step(unsigned int doppler_step)
+     inline void set_doppler_step(unsigned int doppler_step)
      {
          d_doppler_step = doppler_step;
      }
 
-
      /*!
       * \brief Parallel Code Phase Search Acquisition signal processing.
       */
diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h
index e3e662566..a05697eed 100644
--- a/src/algorithms/channel/adapters/channel.h
+++ b/src/algorithms/channel/adapters/channel.h
@@ -73,20 +73,20 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string role() override { return role_; }
+    inline std::string role() override { return role_; }
 
     //! Returns "Channel"
-    std::string implementation() override { return implementation_; }
+    inline std::string implementation() override { return implementation_; }
 
-    size_t item_size() override { return 0; }
-    Gnss_Signal get_signal() const override { return gnss_signal_; }
+    inline size_t item_size() override { return 0; }
+    inline Gnss_Signal get_signal() const override { return gnss_signal_; }
 
     void start_acquisition() override;   //!< Start the State Machine
     void set_signal(const Gnss_Signal& gnss_signal_) override;  //!< Sets the channel GNSS signal
 
-    std::shared_ptr<AcquisitionInterface> acquisition(){ return acq_; }
-    std::shared_ptr<TrackingInterface> tracking(){ return trk_; }
-    std::shared_ptr<TelemetryDecoderInterface> telemetry(){ return nav_; }
+    inline std::shared_ptr<AcquisitionInterface> acquisition(){ return acq_; }
+    inline std::shared_ptr<TrackingInterface> tracking(){ return trk_; }
+    inline std::shared_ptr<TelemetryDecoderInterface> telemetry(){ return nav_; }
 
     void msg_handler_events(pmt::pmt_t msg);
 
diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
index aaf3336b7..b639f1a14 100644
--- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
@@ -63,14 +63,14 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string role() override { return role_; }
+    inline std::string role() override { return role_; }
     //! Returns "Array_Signal_Conditioner"
-    std::string implementation() override { return "Array_Signal_Conditioner"; }
-    size_t item_size() override { return 0; }
+    inline std::string implementation() override { return "Array_Signal_Conditioner"; }
+    inline size_t item_size() override { return 0; }
 
-    std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
-    std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
-    std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
+    inline std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
+    inline std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
+    inline std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
 
 private:
     std::shared_ptr<GNSSBlockInterface> data_type_adapt_;
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h
index 4b0f2fe3e..815bf7cec 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.h
@@ -61,15 +61,15 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string role() override { return role_; }
+    inline std::string role() override { return role_; }
 
-    std::string implementation() override { return "Signal_Conditioner"; }  //!< Returns "Signal_Conditioner"
+    inline std::string implementation() override { return "Signal_Conditioner"; }  //!< Returns "Signal_Conditioner"
 
-    size_t item_size() override { return 0; }
+    inline size_t item_size() override { return 0; }
 
-    std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
-    std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
-    std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
+    inline std::shared_ptr<GNSSBlockInterface> data_type_adapter(){ return data_type_adapt_; }
+    inline std::shared_ptr<GNSSBlockInterface> input_filter(){ return in_filt_; }
+    inline std::shared_ptr<GNSSBlockInterface> resampler(){ return res_; }
 
 private:
     std::shared_ptr<GNSSBlockInterface> data_type_adapt_;
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
index d970bfaaa..85870ba43 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
@@ -52,18 +52,18 @@ public:
 
     virtual ~ByteToShort();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Byte_To_Short"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Byte_To_Short";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
@@ -87,4 +87,3 @@ private:
 };
 
 #endif
-
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
index be11f0f3d..2aa0d1197 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
@@ -53,18 +53,18 @@ public:
 
     virtual ~IbyteToCbyte();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Ibyte_To_Cbyte"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Ibyte_To_Cbyte";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
index 20cc8cfbd..50b38f37e 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
@@ -53,18 +53,18 @@ public:
 
     virtual ~IbyteToComplex();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Ibyte_To_Complex"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Ibyte_To_Complex";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
@@ -88,5 +88,3 @@ private:
 };
 
 #endif
-
-
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
index fd0712a54..71829d6a3 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
@@ -53,18 +53,18 @@ public:
 
     virtual ~IbyteToCshort();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Ibyte_To_Cshort"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Ibyte_To_Cshort";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
@@ -88,4 +88,3 @@ private:
 };
 
 #endif
-
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
index 59bd00710..79a2d7162 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
@@ -52,18 +52,18 @@ public:
 
     virtual ~IshortToComplex();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Ishort_To_Complex"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Ishort_To_Complex";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
@@ -87,4 +87,3 @@ private:
 };
 
 #endif
-
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
index e9ec9f591..cb8080e40 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
@@ -53,18 +53,18 @@ public:
 
     virtual ~IshortToCshort();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Ishort_To_Cshort"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Ishort_To_Cshort";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
@@ -88,4 +88,3 @@ private:
 };
 
 #endif
-
diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h
index 4f651032e..fce549ebf 100644
--- a/src/algorithms/input_filter/adapters/beamformer_filter.h
+++ b/src/algorithms/input_filter/adapters/beamformer_filter.h
@@ -51,18 +51,18 @@ public:
 
     virtual ~BeamformerFilter();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! returns "Direct_Resampler"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Beamformer_Filter";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h
index c449e002b..9a5fdc8a1 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.h
+++ b/src/algorithms/input_filter/adapters/fir_filter.h
@@ -71,18 +71,18 @@ public:
     //! Destructor
     virtual ~FirFilter();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Fir_Filter"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Fir_Filter";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
index ad19dcd2c..baaf47c10 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
@@ -69,18 +69,18 @@ public:
 
     virtual ~FreqXlatingFirFilter();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Freq_Xlating_Fir_Filter"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Freq_Xlating_Fir_Filter";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
index fea5ad8ef..4465fd960 100644
--- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
+++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
@@ -51,18 +51,18 @@ public:
 
     virtual ~PulseBlankingFilter();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Pulse_Blanking_Filter"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Pulse_Blanking_Filter";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h
index b8f394ee2..02cc1647f 100644
--- a/src/algorithms/libs/pass_through.h
+++ b/src/algorithms/libs/pass_through.h
@@ -52,31 +52,37 @@ public:
             unsigned int out_stream);
 
     virtual ~Pass_Through();
-    std::string role()
+
+    inline std::string role() override
     {
         return role_;
     }
+
     //! returns "Pass_Through"
-    std::string implementation()
+    inline std::string implementation() override
     {
         return "Pass_Through";
     }
-    std::string item_type()
+
+    inline std::string item_type() const
     {
         return item_type_;
     }
-    size_t vector_size()
+
+    inline size_t vector_size() const
     {
         return vector_size_;
     }
-    size_t item_size()
+
+    inline size_t item_size() override
     {
         return item_size_;
     }
-    void connect(gr::top_block_sptr top_block);
-    void disconnect(gr::top_block_sptr top_block);
-    gr::basic_block_sptr get_left_block();
-    gr::basic_block_sptr get_right_block();
+    
+    void connect(gr::top_block_sptr top_block) override;
+    void disconnect(gr::top_block_sptr top_block) override;
+    gr::basic_block_sptr get_left_block() override;
+    gr::basic_block_sptr get_right_block() override;
 
 private:
     std::string item_type_;
diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h
index 549971dc2..d986ebb14 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.h
+++ b/src/algorithms/observables/adapters/hybrid_observables.h
@@ -54,13 +54,13 @@ public:
 
     virtual ~HybridObservables();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //!  Returns "Hybrid_Observables"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Hybrid_Observables";
     }
@@ -70,13 +70,13 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
 
     //! All blocks must have an item_size() function implementation
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return sizeof(gr_complex);
     }
diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
index a92babddd..8a188d506 100644
--- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
+++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
@@ -52,18 +52,18 @@ public:
 
     virtual ~DirectResamplerConditioner();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Direct_Resampler"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Direct_Resampler";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
index 8565d9473..8420c3973 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
@@ -49,9 +49,7 @@ direct_resampler_make_conditioner_cb(double sample_freq_in,
  */
 class direct_resampler_conditioner_cb: public gr::block
 {
-
 private:
-
     friend direct_resampler_conditioner_cb_sptr
     direct_resampler_make_conditioner_cb(double sample_freq_in,
             double sample_freq_out);
@@ -67,18 +65,20 @@ private:
             double sample_freq_out);
 
 public:
-
     ~direct_resampler_conditioner_cb();
 
-    unsigned int sample_freq_in() const
+    inline unsigned int sample_freq_in() const
     {
         return d_sample_freq_in;
     }
-    unsigned int sample_freq_out() const
+
+    inline unsigned int sample_freq_out() const
     {
         return d_sample_freq_out;
     }
+
     void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
     int general_work(int noutput_items, gr_vector_int &ninput_items,
             gr_vector_const_void_star &input_items,
             gr_vector_void_star &output_items);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
index c53b0cf9d..626abcdeb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
@@ -70,15 +70,18 @@ private:
 
 public:
     ~direct_resampler_conditioner_cc();
-    unsigned int sample_freq_in() const
+    inline unsigned int sample_freq_in() const
     {
         return d_sample_freq_in;
     }
-    unsigned int sample_freq_out() const
+
+    inline unsigned int sample_freq_out() const
     {
         return d_sample_freq_out;
     }
+
     void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+    
     int general_work(int noutput_items, gr_vector_int &ninput_items,
             gr_vector_const_void_star &input_items,
             gr_vector_void_star &output_items);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
index 3e648b427..63969553a 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
@@ -49,9 +49,7 @@ direct_resampler_make_conditioner_cs(double sample_freq_in,
  */
 class direct_resampler_conditioner_cs: public gr::block
 {
-
 private:
-
     friend direct_resampler_conditioner_cs_sptr
     direct_resampler_make_conditioner_cs(double sample_freq_in,
             double sample_freq_out);
@@ -67,18 +65,20 @@ private:
             double sample_freq_out);
 
 public:
-
     ~direct_resampler_conditioner_cs();
 
-    unsigned int sample_freq_in() const
+    inline unsigned int sample_freq_in() const
     {
         return d_sample_freq_in;
     }
-    unsigned int sample_freq_out() const
+
+    inline unsigned int sample_freq_out() const
     {
         return d_sample_freq_out;
     }
+
     void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+    
     int general_work(int noutput_items, gr_vector_int &ninput_items,
             gr_vector_const_void_star &input_items,
             gr_vector_void_star &output_items);
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h
index e428ba65d..97815b393 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.h
+++ b/src/algorithms/signal_generator/adapters/signal_generator.h
@@ -58,7 +58,7 @@ public:
 
     virtual ~SignalGenerator();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -66,12 +66,12 @@ public:
     /*!
      * \brief Returns "GNSSSignalGenerator".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GNSSSignalGenerator";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h
index 2ed9b56a4..85c9104db 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -59,7 +59,7 @@ public:
 
     virtual ~FileSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -67,12 +67,12 @@ public:
     /*!
      * \brief Returns "File_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "File_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -82,23 +82,27 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string filename()
+    inline std::string filename() const
     {
         return filename_;
     }
-    std::string item_type()
+
+    inline std::string item_type() const
     {
         return item_type_;
     }
-    bool repeat()
+
+    inline bool repeat() const
     {
         return repeat_;
     }
-    long sampling_frequency()
+
+    inline long sampling_frequency() const
     {
         return sampling_frequency_;
     }
-    long samples()
+
+    inline long samples() const
     {
         return samples_;
     }
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index f51e3acd3..5949f8cb0 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -58,7 +58,7 @@ public:
 
     virtual ~FlexibandSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -66,12 +66,12 @@ public:
     /*!
      * \brief Returns "Flexiband_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Flexiband_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h
index 351058f1a..034155bf0 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@@ -57,13 +57,13 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string role() override { return role_; }
+    inline std::string role() override { return role_; }
 
     //! Returns "Signal Source"
-    std::string implementation() override { return "Signal Source"; }
-    size_t item_size() override { return 0; }
+    inline std::string implementation() override { return "Signal Source"; }
+    inline size_t item_size() override { return 0; }
 
-    GNSSBlockInterface *signal_generator() { return signal_generator_; }
+    inline GNSSBlockInterface *signal_generator() const { return signal_generator_; }
 
 private:
     GNSSBlockInterface *signal_generator_;
diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
index a6bbe7b90..af6ab2714 100644
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
@@ -53,7 +53,7 @@ public:
 
     virtual ~Gn3sSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -61,12 +61,12 @@ public:
     /*!
      * \brief Returns "Gn3sSignalSource".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Gn3sSignalSource";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
index e0869dcff..8ca419c91 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -59,7 +59,7 @@ public:
             boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~NsrFileSignalSource();
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -67,12 +67,12 @@ public:
     /*!
      * \brief Returns "Nsr_File_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Nsr_File_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -82,27 +82,27 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string filename()
+    inline std::string filename() const
     {
         return filename_;
     }
 
-    std::string item_type()
+    inline std::string item_type() const
     {
         return item_type_;
     }
 
-    bool repeat()
+    inline bool repeat() const
     {
         return repeat_;
     }
 
-    long sampling_frequency()
+    inline long sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    long samples()
+    inline long samples() const
     {
         return samples_;
     }
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index ed71d9551..6687754b5 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -56,7 +56,7 @@ public:
 
     virtual ~OsmosdrSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -64,12 +64,12 @@ public:
     /*!
      * \brief Returns "Osmosdr_Signal_Source"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Osmosdr_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
index c44a03a28..fe813aa8f 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -53,7 +53,7 @@ public:
 
     virtual ~RawArraySignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -61,12 +61,12 @@ public:
     /*!
      * \brief Returns "RawArraySignalSource".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Raw_Array_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
index 804a41f34..4a2bf88df 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -57,7 +57,7 @@ public:
 
     virtual ~RtlTcpSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -65,12 +65,12 @@ public:
     /*!
      * \brief Returns "RtlTcp_Signal_Source"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "RtlTcp_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
index ccba78788..f620a40c9 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -56,7 +56,7 @@ public:
             boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~SpirFileSignalSource();
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -64,12 +64,12 @@ public:
     /*!
      * \brief Returns "Spir_File_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Spir_File_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -79,27 +79,27 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string filename()
+    inline std::string filename() const
     {
         return filename_;
     }
 
-    std::string item_type()
+    inline std::string item_type() const
     {
         return item_type_;
     }
 
-    bool repeat()
+    inline bool repeat() const
     {
         return repeat_;
     }
 
-    long sampling_frequency()
+    inline long sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    long samples()
+    inline long samples() const
     {
         return samples_;
     }
diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
index b1f2758f6..674bb24de 100644
--- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
@@ -60,7 +60,7 @@ public:
             boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~TwoBitCpxFileSignalSource();
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -68,12 +68,12 @@ public:
     /*!
      * \brief Returns "Two_Bit_Cpx_File_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Two_Bit_Cpx_File_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -83,27 +83,27 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string filename()
+    inline std::string filename() const
     {
         return filename_;
     }
 
-    std::string item_type()
+    inline std::string item_type() const
     {
         return item_type_;
     }
 
-    bool repeat()
+    inline bool repeat() const
     {
         return repeat_;
     }
 
-    long sampling_frequency()
+    inline long sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    long samples()
+    inline long samples() const
     {
         return samples_;
     }
diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
index 5697ef58f..397010311 100644
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
@@ -61,7 +61,7 @@ public:
             boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~TwoBitPackedFileSignalSource();
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -69,12 +69,12 @@ public:
     /*!
      * \brief Returns "Two_Bit_Packed_File_Signal_Source".
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Two_Bit_Packed_File_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -84,47 +84,47 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-    std::string filename()
+    inline std::string filename() const
     {
         return filename_;
     }
 
-    std::string item_type()
+    inline std::string item_type() const
     {
         return item_type_;
     }
 
-    bool repeat()
+    inline bool repeat() const
     {
         return repeat_;
     }
 
-    long sampling_frequency()
+    inline long sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    long samples()
+    inline long samples() const
     {
         return samples_;
     }
 
-    bool big_endian_items()
+    inline bool big_endian_items() const
     {
         return big_endian_items_;
     }
 
-    bool big_endian_bytes()
+    inline bool big_endian_bytes() const
     {
         return big_endian_bytes_;
     }
 
-    bool is_complex()
+    inline bool is_complex() const
     {
         return is_complex_;
     }
 
-    bool reverse_interleaving()
+    inline bool reverse_interleaving() const
     {
         return reverse_interleaving_;
     }
@@ -158,4 +158,3 @@ private:
 };
 
 #endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/
-
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index c17f4e3c6..94a622218 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -55,7 +55,7 @@ public:
 
     virtual ~UhdSignalSource();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -63,12 +63,12 @@ public:
     /*!
      * \brief Returns "UHD_Signal_Source"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "UHD_Signal_Source";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
index b0d336260..5bdc2b4a1 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
@@ -56,7 +56,7 @@ public:
 
     virtual ~GalileoE1BTelemetryDecoder();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -64,7 +64,7 @@ public:
     /*!
      * \brief Returns "Galileo_E1B_Telemetry_Decoder"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1B_Telemetry_Decoder";
     }
@@ -75,14 +75,14 @@ public:
     gr::basic_block_sptr get_right_block() override;
 
     void set_satellite(Gnss_Satellite satellite) override;
-    void set_channel(int channel)  override {telemetry_decoder_->set_channel(channel);}
+    inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
index 005a1a4fa..488f9e24e 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
@@ -57,7 +57,7 @@ public:
 
     virtual ~GalileoE5aTelemetryDecoder();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -65,7 +65,7 @@ public:
     /*!
      * \brief Returns "Galileo_E5a_Telemetry_Decoder"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E5A_Telemetry_Decoder";
     }
@@ -76,14 +76,14 @@ public:
     gr::basic_block_sptr get_right_block() override;
 
     void set_satellite(Gnss_Satellite satellite) override;
-    void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
+    inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
index 8e214258c..d7e2bd0f0 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
@@ -53,13 +53,13 @@ public:
 
     virtual ~GpsL1CaTelemetryDecoder();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_Telemetry_Decoder"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_Telemetry_Decoder";
     }
@@ -70,13 +70,14 @@ public:
     gr::basic_block_sptr get_right_block() override;
 
     void set_satellite(Gnss_Satellite satellite) override;
-    void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
+    inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
-    size_t item_size() override
+
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
index a81721c94..f60daf5e6 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
@@ -53,13 +53,13 @@ public:
 
     virtual ~GpsL2CTelemetryDecoder();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L2C_Telemetry_Decoder"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L2C_Telemetry_Decoder";
     }
@@ -70,13 +70,13 @@ public:
     gr::basic_block_sptr get_right_block() override;
 
     void set_satellite(Gnss_Satellite satellite) override;
-    void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);}
+    inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
index 090f67722..3b1af8da3 100644
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~SbasL1TelemetryDecoder();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
@@ -62,7 +62,7 @@ public:
     /*!
      * \brief Returns "SBAS_L1_Telemetry_Decoder"
      */
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "SBAS_L1_Telemetry_Decoder";
     }
@@ -73,14 +73,14 @@ public:
     gr::basic_block_sptr get_right_block() override;
 
     void set_satellite(Gnss_Satellite satellite) override;
-    void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
+    inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); }
 
-    void reset() override
+    inline void reset() override
     {
         return;
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return 0;
     }
diff --git a/src/algorithms/telemetry_decoder/libs/convolutional.h b/src/algorithms/telemetry_decoder/libs/convolutional.h
index 5f0f1b379..936c45985 100644
--- a/src/algorithms/telemetry_decoder/libs/convolutional.h
+++ b/src/algorithms/telemetry_decoder/libs/convolutional.h
@@ -57,7 +57,7 @@ const float MAXLOG = 1e7;  /* Define infinity */
  *
  * This function is used by nsc_enc_bit(), rsc_enc_bit(), and rsc_tail()
  */
-static int parity_counter(int symbol, int length)
+inline static int parity_counter(int symbol, int length)
 {
     int counter;
     int temp_parity = 0;
@@ -71,7 +71,6 @@ static int parity_counter(int symbol, int length)
 }
 
 
-
 /*!
  * \brief Convolutionally encodes a single bit using a rate 1/n encoder.
  * Takes in one input bit at a time, and produces a n-bit output.
@@ -86,7 +85,7 @@ static int parity_counter(int symbol, int length)
  *
  * This function is used by nsc_transit()
  */
-static int nsc_enc_bit(int state_out_p[],
+inline static int nsc_enc_bit(int state_out_p[],
                        int input,
                        int state_in,
                        int g[],
@@ -113,11 +112,10 @@ static int nsc_enc_bit(int state_out_p[],
 }
 
 
-
 /*!
  * \brief Function that creates the transit and output vectors
  */
-static void nsc_transit(int output_p[],
+inline static void nsc_transit(int output_p[],
                         int trans_p[],
                         int input,
                         int g[],
@@ -138,7 +136,6 @@ static void nsc_transit(int output_p[],
 }
 
 
-
 /*!
  * \brief  Computes the branch metric used for decoding.
  *  \return (returned float) The metric between the hypothetical symbol and the received vector
@@ -147,7 +144,7 @@ static void nsc_transit(int output_p[],
  *  \param[in] nn            The length of the received vector
  *
  */
-static float Gamma(float  rec_array[],
+inline static float Gamma(float  rec_array[],
                    int symbol,
                    int nn)
 {
@@ -177,7 +174,7 @@ static float Gamma(float  rec_array[],
  * \param[out] output_u_int[]    Hard decisions on the data bits
  *
  */
-static void Viterbi(int output_u_int[],
+inline static void Viterbi(int output_u_int[],
                     int out0[],
                     int state0[],
                     int out1[],
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
index 5b0faf081..4b478f666 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
@@ -7,7 +7,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -59,18 +59,18 @@ public:
 
     virtual ~GalileoE1DllPllVemlTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Galileo_E1_DLL_PLL_VEML_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_DLL_PLL_VEML_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
index 485bd809f..bba2940cd 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
@@ -59,18 +59,18 @@ public:
 
     virtual ~GalileoE1TcpConnectorTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Galileo_E1_TCP_CONNECTOR_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E1_TCP_CONNECTOR_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
index 6d45c7b37..a49aab785 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
@@ -59,18 +59,18 @@ public:
 
     virtual ~GalileoE5aDllPllTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "Galileo_E5a_DLL_PLL_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "Galileo_E5a_DLL_PLL_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
index 375c2d621..d3b01a87c 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
@@ -8,7 +8,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -59,18 +59,18 @@ public:
 
     virtual ~GpsL1CaDllPllCAidTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h
index fe7bf561f..c828f9c3d 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h
@@ -9,7 +9,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -57,18 +57,18 @@ public:
 
     virtual ~GpsL1CaDllPllCAidTrackingFpga();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
index 538f50ae9..495594a1f 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
@@ -8,7 +8,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -58,18 +58,18 @@ public:
 
     virtual ~GpsL1CaDllPllTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_DLL_PLL_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_DLL_PLL_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
index b4699aef2..5ff4dcf5d 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
@@ -7,7 +7,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -57,17 +57,18 @@ public:
 
     virtual ~GpsL1CaDllPllTrackingGPU();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_DLL_PLL_Tracking_GPU"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_DLL_PLL_Tracking_GPU";
     }
-    size_t item_size() override
+
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
index 0a5313450..b2327e04a 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
@@ -8,7 +8,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -52,7 +52,6 @@ class GpsL1CaTcpConnectorTracking : public TrackingInterface
 {
 
 public:
-
   GpsL1CaTcpConnectorTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -60,18 +59,18 @@ public:
 
     virtual ~GpsL1CaTcpConnectorTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L1_CA_TCP_CONNECTOR_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L1_CA_TCP_CONNECTOR_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
@@ -81,7 +80,6 @@ public:
     gr::basic_block_sptr get_left_block() override;
     gr::basic_block_sptr get_right_block() override;
 
-
     /*!
      * \brief Set tracking channel unique ID
      */
@@ -93,7 +91,6 @@ public:
      */
     void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override;
 
-
     void start_tracking() override;
 
 private:
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
index aef85f4fc..80b214811 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
@@ -8,7 +8,7 @@
  * Code DLL + carrier PLL according to the algorithms described in:
  * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
  * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
  *
  * -------------------------------------------------------------------------
  *
@@ -58,18 +58,18 @@ public:
 
     virtual ~GpsL2MDllPllTracking();
 
-    std::string role() override
+    inline std::string role() override
     {
         return role_;
     }
 
     //! Returns "GPS_L2_M_DLL_PLL_Tracking"
-    std::string implementation() override
+    inline std::string implementation() override
     {
         return "GPS_L2_M_DLL_PLL_Tracking";
     }
 
-    size_t item_size() override
+    inline size_t item_size() override
     {
         return item_size_;
     }
diff --git a/src/core/system_parameters/galileo_ephemeris.h b/src/core/system_parameters/galileo_ephemeris.h
index a6dcc515d..c279fd649 100644
--- a/src/core/system_parameters/galileo_ephemeris.h
+++ b/src/core/system_parameters/galileo_ephemeris.h
@@ -89,7 +89,7 @@ public:
     bool E5a_DVS;              //!< E5a Data Validity Status
     double E5b_DVS_5;          //!< E5b Data Validity Status
     double E1B_DVS_5;          //!< E1B Data Validity Status
-    
+
     double BGD_E1E5a_5;        //!< E1-E5a Broadcast Group Delay [s]
     double BGD_E1E5b_5;        //!< E1-E5b Broadcast Group Delay [s]
 
@@ -116,7 +116,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_cnav_ephemeris.h b/src/core/system_parameters/gps_cnav_ephemeris.h
index df5d1c04f..05f2c5029 100644
--- a/src/core/system_parameters/gps_cnav_ephemeris.h
+++ b/src/core/system_parameters/gps_cnav_ephemeris.h
@@ -130,7 +130,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_cnav_iono.h b/src/core/system_parameters/gps_cnav_iono.h
index 67c1757ae..426f199cb 100644
--- a/src/core/system_parameters/gps_cnav_iono.h
+++ b/src/core/system_parameters/gps_cnav_iono.h
@@ -63,7 +63,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version) const
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_cnav_utc_model.h b/src/core/system_parameters/gps_cnav_utc_model.h
index da50b7ffe..b595a4439 100644
--- a/src/core/system_parameters/gps_cnav_utc_model.h
+++ b/src/core/system_parameters/gps_cnav_utc_model.h
@@ -71,7 +71,7 @@ public:
     /*
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h
index c71fde0b6..0a413a927 100644
--- a/src/core/system_parameters/gps_ephemeris.h
+++ b/src/core/system_parameters/gps_ephemeris.h
@@ -132,7 +132,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
@@ -199,7 +199,6 @@ public:
      */
     double sv_clock_relativistic_term(double transmitTime);
 
-
     /*!
      * Default constructor
      */
diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h
index 0544c90a2..a7e59c02b 100644
--- a/src/core/system_parameters/gps_iono.h
+++ b/src/core/system_parameters/gps_iono.h
@@ -63,7 +63,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_ref_location.h b/src/core/system_parameters/gps_ref_location.h
index ecd824895..1aa734088 100644
--- a/src/core/system_parameters/gps_ref_location.h
+++ b/src/core/system_parameters/gps_ref_location.h
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the Ref location on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
         {
             using boost::serialization::make_nvp;
             if(version){};
diff --git a/src/core/system_parameters/gps_ref_time.h b/src/core/system_parameters/gps_ref_time.h
index 4ef7bef47..fbb246ad3 100644
--- a/src/core/system_parameters/gps_ref_time.h
+++ b/src/core/system_parameters/gps_ref_time.h
@@ -58,7 +58,7 @@ public:
     /*!
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ref time data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/gps_utc_model.h b/src/core/system_parameters/gps_utc_model.h
index 54df8b1bf..0d1c48285 100644
--- a/src/core/system_parameters/gps_utc_model.h
+++ b/src/core/system_parameters/gps_utc_model.h
@@ -64,7 +64,7 @@ public:
     /*
      * \brief Serialize is a boost standard method to be called by the boost XML serialization. Here is used to save the ephemeris data on disk file.
      */
-    void serialize(Archive& archive, const unsigned int version)
+    inline void serialize(Archive& archive, const unsigned int version)
     {
         using boost::serialization::make_nvp;
         if(version){};
diff --git a/src/core/system_parameters/rtcm.h b/src/core/system_parameters/rtcm.h
index 37cdab1f4..8b3333ffe 100644
--- a/src/core/system_parameters/rtcm.h
+++ b/src/core/system_parameters/rtcm.h
@@ -368,7 +368,7 @@ private:
             return data_;
         }
 
-        std::size_t length() const
+        inline std::size_t length() const
         {
             return header_length + body_length_;
         }
@@ -395,7 +395,7 @@ private:
                 body_length_ = max_body_length;
         }
 
-        bool decode_header()
+        inline bool decode_header()
         {
             char header[header_length + 1] = "";
             std::strncat(header, data_, header_length);
@@ -420,7 +420,7 @@ private:
             return true;
         }
 
-        void encode_header()
+        inline void encode_header()
         {
             char header[header_length + 1] = "";
             std::sprintf(header, "GS%4d", static_cast<int>(body_length_));
@@ -444,19 +444,19 @@ private:
     class Rtcm_Listener_Room
     {
     public:
-        void join(std::shared_ptr<Rtcm_Listener> participant)
+        inline void join(std::shared_ptr<Rtcm_Listener> participant)
         {
             participants_.insert(participant);
             for (auto msg: recent_msgs_)
                 participant->deliver(msg);
         }
 
-        void leave(std::shared_ptr<Rtcm_Listener> participant)
+        inline void leave(std::shared_ptr<Rtcm_Listener> participant)
         {
             participants_.erase(participant);
         }
 
-        void deliver(const Rtcm_Message & msg)
+        inline void deliver(const Rtcm_Message & msg)
         {
             recent_msgs_.push_back(msg);
             while (recent_msgs_.size() > max_recent_msgs)
@@ -480,13 +480,13 @@ private:
     public:
         Rtcm_Session(boost::asio::ip::tcp::socket socket, Rtcm_Listener_Room & room) : socket_(std::move(socket)), room_(room)   { }
 
-        void start()
+        inline void start()
         {
             room_.join(shared_from_this());
             do_read_message_header();
         }
 
-        void deliver(const Rtcm_Message & msg)
+        inline void deliver(const Rtcm_Message & msg)
         {
             bool write_in_progress = !write_msgs_.empty();
             write_msgs_.push_back(msg);
@@ -497,7 +497,7 @@ private:
         }
 
     private:
-        void do_read_message_header()
+        inline void do_read_message_header()
         {
             auto self(shared_from_this());
             boost::asio::async_read(socket_,
@@ -532,7 +532,7 @@ private:
                     });
         }
 
-        void do_read_message_body()
+        inline void do_read_message_body()
         {
             auto self(shared_from_this());
             boost::asio::async_read(socket_,
@@ -555,7 +555,7 @@ private:
                     });
         }
 
-        void do_write()
+        inline void do_write()
         {
             auto self(shared_from_this());
             boost::asio::async_write(socket_,
@@ -597,12 +597,12 @@ private:
             do_connect(endpoint_iterator);
     }
 
-        void close()
+        inline void close()
         {
             io_service_.post([this]() { socket_.close(); });
         }
 
-        void write(const Rtcm_Message & msg)
+        inline void write(const Rtcm_Message & msg)
         {
             io_service_.post(
                     [this, msg]()
@@ -617,7 +617,7 @@ private:
         }
 
     private:
-        void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
+        inline void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
         {
             boost::asio::async_connect(socket_, endpoint_iterator,
                     [this](boost::system::error_code ec, boost::asio::ip::tcp::resolver::iterator)
@@ -633,7 +633,7 @@ private:
                     });
         }
 
-        void do_read_message()
+        inline void do_read_message()
         {
             boost::asio::async_read(socket_,
                     boost::asio::buffer(read_msg_.data(), 1029),
@@ -651,9 +651,8 @@ private:
                     });
         }
 
-        void do_write()
+        inline void do_write()
         {
-
             boost::asio::async_write(socket_,
                     boost::asio::buffer(write_msgs_.front().data(), write_msgs_.front().length()),
                     [this](boost::system::error_code ec, std::size_t /*length*/)
@@ -692,7 +691,7 @@ private:
             c = std::make_shared<Tcp_Internal_Client>(io_service, queue_endpoint_iterator);
     }
 
-        void do_read_queue()
+        inline void do_read_queue()
         {
             for(;;)
                 {
@@ -726,14 +725,14 @@ private:
             do_accept();
     }
 
-        void close_server()
+        inline void close_server()
         {
             socket_.close();
             acceptor_.close();
         }
 
     private:
-        void do_accept()
+        inline void do_accept()
         {
             acceptor_.async_accept(socket_, [this](boost::system::error_code ec)
                     {
@@ -766,7 +765,6 @@ private:
         bool first_client = true;
     };
 
-
     boost::asio::io_service io_service;
     std::shared_ptr< concurrent_queue<std::string> > rtcm_message_queue;
     std::thread t;