From 6b258c68ac0049d861c096a8a1bd668890d91903 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 5 Feb 2015 01:14:04 +0100 Subject: [PATCH] removing an include that was not required --- .../gnuradio_blocks/interleaved_byte_to_complex_byte.h | 1 - .../interleaved_short_to_complex_short.h | 2 -- .../input_filter/adapters/freq_xlating_fir_filter.cc | 10 +++++----- .../gnuradio_blocks/byte_x2_to_complex_byte.h | 1 - .../gnuradio_blocks/complex_byte_to_float_x2.h | 3 +-- .../gnuradio_blocks/complex_float_to_complex_byte.h | 4 +--- .../input_filter/gnuradio_blocks/cshort_to_float_x2.h | 3 +-- .../input_filter/gnuradio_blocks/short_x2_to_cshort.h | 1 - 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h index 4645fe788..d650c2f8b 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h @@ -32,7 +32,6 @@ #define GNSS_SDR_INTERLEAVED_BYTE_TO_COMPLEX_BYTE_H_ -#include #include #include diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h index f3f92b962..d85735ae5 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h @@ -31,8 +31,6 @@ #ifndef GNSS_SDR_INTERLEAVED_SHORT_TO_COMPLEX_SHORT_H_ #define GNSS_SDR_INTERLEAVED_SHORT_TO_COMPLEX_SHORT_H_ - -#include #include #include diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index d959443e8..631f55a72 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -107,7 +107,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration } else { - LOG(ERROR) << taps_item_type_ << " unknown input filter item type"; + LOG(ERROR) << " Unknown input filter input/output item type conversion"; item_size = sizeof(gr_complex); //avoids uninitialization } @@ -186,7 +186,7 @@ void FreqXlatingFirFilter::connect(gr::top_block_sptr top_block) } else { - LOG(ERROR) << " unknown input filter item type"; + LOG(ERROR) << " Unknown input filter input/output item type conversion"; } } @@ -252,7 +252,7 @@ void FreqXlatingFirFilter::disconnect(gr::top_block_sptr top_block) } else { - LOG(ERROR) << " unknown input filter item type"; + LOG(ERROR) << " Unknown input filter input/output item type conversion"; } } @@ -292,7 +292,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block() else { return nullptr; - LOG(ERROR) << " unknown input filter item type"; + LOG(ERROR) << " Unknown input filter input/output item type conversion"; } } @@ -332,7 +332,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block() else { return nullptr; - LOG(ERROR) << " unknown input filter item type"; + LOG(ERROR) << " Unknown input filter input/output item type conversion"; } } diff --git a/src/algorithms/input_filter/gnuradio_blocks/byte_x2_to_complex_byte.h b/src/algorithms/input_filter/gnuradio_blocks/byte_x2_to_complex_byte.h index e730c6935..a46f4c544 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/byte_x2_to_complex_byte.h +++ b/src/algorithms/input_filter/gnuradio_blocks/byte_x2_to_complex_byte.h @@ -32,7 +32,6 @@ #define GNSS_SDR_BYTE_X2_TO_COMPLEX_BYTE_H_ -#include #include #include diff --git a/src/algorithms/input_filter/gnuradio_blocks/complex_byte_to_float_x2.h b/src/algorithms/input_filter/gnuradio_blocks/complex_byte_to_float_x2.h index 6842930d0..6883f7d39 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/complex_byte_to_float_x2.h +++ b/src/algorithms/input_filter/gnuradio_blocks/complex_byte_to_float_x2.h @@ -32,7 +32,6 @@ #define GNSS_SDR_COMPLEX_BYTE_TO_FLOAT_X2_H_ -#include #include #include @@ -46,7 +45,7 @@ complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2(); * \brief This class adapts a std::complex stream * into two 16-bits (short) streams */ -class complex_byte_to_float_x2 : public gr::sync_block +class complex_byte_to_float_x2 : public gr::sync_block { private: friend complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2(); diff --git a/src/algorithms/input_filter/gnuradio_blocks/complex_float_to_complex_byte.h b/src/algorithms/input_filter/gnuradio_blocks/complex_float_to_complex_byte.h index 81c26ed89..50f50564b 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/complex_float_to_complex_byte.h +++ b/src/algorithms/input_filter/gnuradio_blocks/complex_float_to_complex_byte.h @@ -31,8 +31,6 @@ #ifndef GNSS_SDR_COMPLEX_FLOAT_TO_COMPLEX_BYTE_H_ #define GNSS_SDR_COMPLEX_FLOAT_TO_COMPLEX_BYTE_H_ - -#include #include #include @@ -45,7 +43,7 @@ complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte(); /*! * \brief This class adapts a gr_complex stream into a std::complex stream */ -class complex_float_to_complex_byte : public gr::sync_block +class complex_float_to_complex_byte : public gr::sync_block { private: friend complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte(); diff --git a/src/algorithms/input_filter/gnuradio_blocks/cshort_to_float_x2.h b/src/algorithms/input_filter/gnuradio_blocks/cshort_to_float_x2.h index ef5b333ae..c15662ed8 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/cshort_to_float_x2.h +++ b/src/algorithms/input_filter/gnuradio_blocks/cshort_to_float_x2.h @@ -32,7 +32,6 @@ #define GNSS_SDR_CSHORT_TO_FLOAT_X2_H_ -#include #include #include @@ -46,7 +45,7 @@ cshort_to_float_x2_sptr make_cshort_to_float_x2(); * \brief This class adapts a std::complex stream * into two 32-bits (float) streams */ -class cshort_to_float_x2 : public gr::sync_block +class cshort_to_float_x2 : public gr::sync_block { private: friend cshort_to_float_x2_sptr make_cshort_to_float_x2(); diff --git a/src/algorithms/input_filter/gnuradio_blocks/short_x2_to_cshort.h b/src/algorithms/input_filter/gnuradio_blocks/short_x2_to_cshort.h index 5794d6007..6bd44fddf 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/short_x2_to_cshort.h +++ b/src/algorithms/input_filter/gnuradio_blocks/short_x2_to_cshort.h @@ -32,7 +32,6 @@ #define GNSS_SDR_SHORT_X2_TO_CSHORT_H_ -#include #include #include