From 865a54ddff072d5826aa06d6366ab0844b036c94 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 3 Apr 2020 00:17:22 +0200 Subject: [PATCH] Apply clang-format --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h | 1 - .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h | 1 - .../acquisition/gnuradio_blocks/pcps_acquisition_fpga.h | 1 - src/algorithms/observables/gnuradio_blocks/CMakeLists.txt | 6 ++++++ .../signal_source/adapters/ad9361_fpga_signal_source.h | 1 - .../signal_source/adapters/fmcomms2_signal_source.h | 1 - .../signal_source/adapters/osmosdr_signal_source.h | 1 - .../signal_source/adapters/plutosdr_signal_source.h | 1 - .../gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h | 4 ++-- .../gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h | 4 ++-- .../gnuradio_blocks/galileo_telemetry_decoder_gs.h | 4 ++-- .../gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h | 4 ++-- .../gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h | 4 ++-- .../tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h | 3 +-- src/core/libs/gnss_sdr_time_counter.h | 2 +- 15 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h index 512476871..6334657ab 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h @@ -24,7 +24,6 @@ #include "rtklib.h" #include #include -#include // for std::shared_ptr #include // for sync_block #include // for gr_vector_const_void_star #include // for pmt_t 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 23c31f4ad..e34b5e5f2 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 @@ -55,7 +55,6 @@ #include #include #include -#include #if GNURADIO_USES_STD_POINTERS #else #include diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index aeb444829..8dc970f2e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -32,7 +32,6 @@ #include "channel_fsm.h" #include "fpga_acquisition.h" -#include #include #include // for uint32_t #include // for shared_ptr diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 5108fb879..50f018127 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -47,6 +47,12 @@ target_link_libraries(obs_gr_blocks Matio::matio ) +if(GNURADIO_USES_STD_POINTERS) + target_compile_definitions(obs_gr_blocks + PUBLIC -DGNURADIO_USES_STD_POINTERS=1 + ) +endif() + if(ENABLE_CLANG_TIDY) if(CLANG_TIDY_EXE) set_target_properties(obs_gr_blocks diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h index 5e8650214..f8af17830 100644 --- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h +++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h @@ -24,7 +24,6 @@ #include "concurrent_queue.h" #include "fpga_switch.h" #include "gnss_block_interface.h" -#include #include #include #include diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h index 3eff16aff..cb395862c 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h @@ -23,7 +23,6 @@ #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H #include "gnss_block_interface.h" -#include #include #if GRIIO_INCLUDE_HAS_GNURADIO #include diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index 47b2fad7f..79c67b07c 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -24,7 +24,6 @@ #include "concurrent_queue.h" #include "gnss_block_interface.h" -#include #include #include #include diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h index 4f0082025..5be21e53b 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h @@ -22,7 +22,6 @@ #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H #include "gnss_block_interface.h" -#include #include #if GRIIO_INCLUDE_HAS_GNURADIO #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h index 5edb48b64..970cd6ab5 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h @@ -26,8 +26,8 @@ #include "beidou_dnav_navigation_message.h" #include "gnss_satellite.h" #include -#include // for block -#include // for gr_vector_const_void_star +#include // for block +#include // for gr_vector_const_void_star #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h index afca8bef1..71a3976c2 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.h @@ -23,8 +23,8 @@ #include "beidou_dnav_navigation_message.h" #include "gnss_satellite.h" #include -#include // for block -#include // for gr_vector_const_void_star +#include // for block +#include // for gr_vector_const_void_star #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h index 9b1f02877..6dcff1633 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h @@ -26,8 +26,8 @@ #include "galileo_navigation_message.h" #include "gnss_satellite.h" #include -#include // for block -#include // for gr_vector_const_void_star +#include // for block +#include // for gr_vector_const_void_star #include #include #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h index 5c0a8f488..294a22763 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h @@ -27,8 +27,8 @@ #include "gnss_satellite.h" #include "gnss_synchro.h" #include -#include // for block -#include // for gr_vector_const_void_star +#include // for block +#include // for gr_vector_const_void_star #include #include #include // for ofstream diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h index 0163ca5f3..4d139a857 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h @@ -21,14 +21,14 @@ #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_GS_H #include "gnss_satellite.h" -#include // for crc_optimal -#include // for std::shared_ptr +#include // for crc_optimal #include #include // for gr_vector_const_void_star #include // for size_t #include #include #include +#include // for std::shared_ptr #include #include // for pair #include diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h index 1c5827352..caebfa514 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h @@ -26,7 +26,6 @@ #include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter #include "tracking_loop_filter.h" // for DLL filter #include -#include // for std::shared_ptr #include // for block #include // for gr_complex #include // for gr_vector_int, gr_vector... @@ -34,7 +33,7 @@ #include // for volk_gnsssdr::vector #include // for int32_t #include // for string, ofstream -#include +#include // for std::shared_ptr #include #include // for pair #if GNURADIO_USES_STD_POINTERS diff --git a/src/core/libs/gnss_sdr_time_counter.h b/src/core/libs/gnss_sdr_time_counter.h index ed8846102..f3f583fde 100644 --- a/src/core/libs/gnss_sdr_time_counter.h +++ b/src/core/libs/gnss_sdr_time_counter.h @@ -21,10 +21,10 @@ #ifndef GNSS_SDR_GNSS_SDR_TIME_COUNTER_H #define GNSS_SDR_GNSS_SDR_TIME_COUNTER_H -#include #include #include // for gr_vector_const_void_star #include +#include class gnss_sdr_time_counter;