diff options
Diffstat (limited to 'gr-digital')
89 files changed, 428 insertions, 421 deletions
diff --git a/gr-digital/include/gnuradio/digital/adaptive_algorithm_cma.h b/gr-digital/include/gnuradio/digital/adaptive_algorithm_cma.h index 0544468ea4..5c58255744 100644 --- a/gr-digital/include/gnuradio/digital/adaptive_algorithm_cma.h +++ b/gr-digital/include/gnuradio/digital/adaptive_algorithm_cma.h @@ -83,7 +83,7 @@ public: return conj(conj(tap) - d_step_size * u_n * conj(err)); } - ~adaptive_algorithm_cma() {} + ~adaptive_algorithm_cma() override {} }; } // namespace digital diff --git a/gr-digital/include/gnuradio/digital/adaptive_algorithm_lms.h b/gr-digital/include/gnuradio/digital/adaptive_algorithm_lms.h index 2be52b9fba..ee82190ef8 100644 --- a/gr-digital/include/gnuradio/digital/adaptive_algorithm_lms.h +++ b/gr-digital/include/gnuradio/digital/adaptive_algorithm_lms.h @@ -38,7 +38,7 @@ public: return adaptive_algorithm_lms::sptr(new adaptive_algorithm_lms(cons, step_size)); } - ~adaptive_algorithm_lms() {} + ~adaptive_algorithm_lms() override {} void update_taps(gr_complex* taps, const gr_complex* in, diff --git a/gr-digital/include/gnuradio/digital/adaptive_algorithm_nlms.h b/gr-digital/include/gnuradio/digital/adaptive_algorithm_nlms.h index 5c8145afa8..f5f1724a94 100644 --- a/gr-digital/include/gnuradio/digital/adaptive_algorithm_nlms.h +++ b/gr-digital/include/gnuradio/digital/adaptive_algorithm_nlms.h @@ -63,7 +63,7 @@ public: } } - ~adaptive_algorithm_nlms() {} + ~adaptive_algorithm_nlms() override {} void initialize_taps(std::vector<gr_complex>& taps) override { diff --git a/gr-digital/include/gnuradio/digital/constellation.h b/gr-digital/include/gnuradio/digital/constellation.h index 7371932f60..a8fffe111e 100644 --- a/gr-digital/include/gnuradio/digital/constellation.h +++ b/gr-digital/include/gnuradio/digital/constellation.h @@ -243,7 +243,7 @@ public: unsigned int dimensionality, bool normalize_points = true); - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; // void calc_metric(gr_complex *sample, float *metric, trellis_metric_type_t type); // void calc_euclidean_metric(gr_complex *sample, float *metric); // void calc_hard_symbol_metric(gr_complex *sample, float *metric); @@ -288,9 +288,9 @@ public: unsigned int dimensionality, unsigned int n_sectors); - ~constellation_sector(); + ~constellation_sector() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: virtual unsigned int get_sector(const gr_complex* sample) = 0; @@ -346,7 +346,7 @@ public: unsigned int imag_sectors, float width_real_sectors, float width_imag_sectors); - ~constellation_rect(); + ~constellation_rect() override; protected: constellation_rect(std::vector<gr_complex> constell, @@ -357,9 +357,9 @@ protected: float width_real_sectors, float width_imag_sectors); - unsigned int get_sector(const gr_complex* sample); + unsigned int get_sector(const gr_complex* sample) override; gr_complex calc_sector_center(unsigned int sector); - unsigned int calc_sector_value(unsigned int sector); + unsigned int calc_sector_value(unsigned int sector) override; private: unsigned int n_real_sectors; @@ -403,7 +403,7 @@ public: float width_real_sectors, float width_imag_sectors, std::vector<unsigned int> sector_values); - ~constellation_expl_rect(); + ~constellation_expl_rect() override; protected: constellation_expl_rect(std::vector<gr_complex> constellation, @@ -415,7 +415,7 @@ protected: float width_imag_sectors, std::vector<unsigned int> sector_values); - unsigned int calc_sector_value(unsigned int sector) + unsigned int calc_sector_value(unsigned int sector) override { return d_sector_values[sector]; } @@ -450,12 +450,12 @@ public: std::vector<int> pre_diff_code, unsigned int n_sectors); - ~constellation_psk(); + ~constellation_psk() override; protected: - unsigned int get_sector(const gr_complex* sample); + unsigned int get_sector(const gr_complex* sample) override; - unsigned int calc_sector_value(unsigned int sector); + unsigned int calc_sector_value(unsigned int sector) override; constellation_psk(std::vector<gr_complex> constell, std::vector<int> pre_diff_code, @@ -487,9 +487,9 @@ public: // public constructor static sptr make(); - ~constellation_bpsk(); + ~constellation_bpsk() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_bpsk(); @@ -523,9 +523,9 @@ public: // public constructor static sptr make(); - ~constellation_qpsk(); + ~constellation_qpsk() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_qpsk(); @@ -558,9 +558,9 @@ public: // public constructor static sptr make(); - ~constellation_dqpsk(); + ~constellation_dqpsk() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_dqpsk(); @@ -595,9 +595,9 @@ public: // public constructor static sptr make(); - ~constellation_8psk(); + ~constellation_8psk() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_8psk(); @@ -631,9 +631,9 @@ public: // public constructor static sptr make(); - ~constellation_8psk_natural(); + ~constellation_8psk_natural() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_8psk_natural(); @@ -669,9 +669,9 @@ public: // public constructor static sptr make(); - ~constellation_16qam(); + ~constellation_16qam() override; - unsigned int decision_maker(const gr_complex* sample); + unsigned int decision_maker(const gr_complex* sample) override; protected: constellation_16qam(); diff --git a/gr-digital/include/gnuradio/digital/header_format_counter.h b/gr-digital/include/gnuradio/digital/header_format_counter.h index f04c76fa8a..185e556be4 100644 --- a/gr-digital/include/gnuradio/digital/header_format_counter.h +++ b/gr-digital/include/gnuradio/digital/header_format_counter.h @@ -53,7 +53,7 @@ public: typedef std::shared_ptr<header_format_counter> sptr; header_format_counter(const std::string& access_code, int threshold, int bps); - virtual ~header_format_counter(); + ~header_format_counter() override; /*! * Creates a header from the access code and packet length to @@ -72,15 +72,15 @@ public: * input PDU). Data can be extracted from this for the * header formatting or inserted. */ - virtual bool format(int nbytes_in, - const unsigned char* input, - pmt::pmt_t& output, - pmt::pmt_t& info); + bool format(int nbytes_in, + const unsigned char* input, + pmt::pmt_t& output, + pmt::pmt_t& info) override; /*! * Returns the length of the formatted header in bits. */ - virtual size_t header_nbits() const; + size_t header_nbits() const override; /*! * Factory to create an async packet header formatter; returns @@ -101,7 +101,7 @@ protected: uint16_t d_counter; //!< keeps track of the number of packets transmitted //! Verify that the header is valid - bool header_ok(); + bool header_ok() override; /*! Get info from the header; return payload length and package * rest of data in d_info dictionary. @@ -112,7 +112,7 @@ protected: | access code | pkt len | pkt len | bps | counter | payload | \endverbatim */ - int header_payload(); + int header_payload() override; }; } // namespace digital diff --git a/gr-digital/include/gnuradio/digital/header_format_crc.h b/gr-digital/include/gnuradio/digital/header_format_crc.h index 4db0376730..d89fcb08e5 100644 --- a/gr-digital/include/gnuradio/digital/header_format_crc.h +++ b/gr-digital/include/gnuradio/digital/header_format_crc.h @@ -49,7 +49,7 @@ public: typedef std::shared_ptr<header_format_crc> sptr; header_format_crc(const std::string& len_key_name = "packet_len", const std::string& num_key_name = "packet_num"); - virtual ~header_format_crc(); + ~header_format_crc() override; void set_header_num(unsigned header_num) { d_header_number = header_num; }; @@ -64,20 +64,20 @@ public: * - Bits 12-23: The header number (counts up everytime this function is called) * - Bit 24-31: 8-Bit CRC */ - virtual bool format(int nbytes_in, - const unsigned char* input, - pmt::pmt_t& output, - pmt::pmt_t& info); + bool format(int nbytes_in, + const unsigned char* input, + pmt::pmt_t& output, + pmt::pmt_t& info) override; - virtual bool parse(int nbits_in, - const unsigned char* input, - std::vector<pmt::pmt_t>& info, - int& nbits_processed); + bool parse(int nbits_in, + const unsigned char* input, + std::vector<pmt::pmt_t>& info, + int& nbits_processed) override; /*! * Returns the length of the formatted header in bits. */ - virtual size_t header_nbits() const; + size_t header_nbits() const override; /*! * Factory to create an async packet header formatter; returns @@ -93,12 +93,12 @@ protected: boost::crc_optimal<8, 0x07, 0xFF, 0x00, false, false> d_crc_impl; //! Verify that the header is valid - virtual bool header_ok(); + bool header_ok() override; /*! Get info from the header; return payload length and package * rest of data in d_info dictionary. */ - virtual int header_payload(); + int header_payload() override; }; } // namespace digital diff --git a/gr-digital/include/gnuradio/digital/header_format_default.h b/gr-digital/include/gnuradio/digital/header_format_default.h index 05f8d1e9f4..2f900f605a 100644 --- a/gr-digital/include/gnuradio/digital/header_format_default.h +++ b/gr-digital/include/gnuradio/digital/header_format_default.h @@ -70,7 +70,7 @@ class DIGITAL_API header_format_default : public header_format_base public: typedef std::shared_ptr<header_format_default> sptr; header_format_default(const std::string& access_code, int threshold, int bps); - virtual ~header_format_default(); + ~header_format_default() override; /*! * Creates a header from the access code and packet length and @@ -89,10 +89,10 @@ public: * input PDU). Data can be extracted from this for the * header formatting or inserted. */ - virtual bool format(int nbytes_in, - const unsigned char* input, - pmt::pmt_t& output, - pmt::pmt_t& info); + bool format(int nbytes_in, + const unsigned char* input, + pmt::pmt_t& output, + pmt::pmt_t& info) override; /*! * Parses a header of the form: @@ -124,15 +124,15 @@ public: * premature return after a bad header could be less than * this. */ - virtual bool parse(int nbits_in, - const unsigned char* input, - std::vector<pmt::pmt_t>& info, - int& nbits_processed); + bool parse(int nbits_in, + const unsigned char* input, + std::vector<pmt::pmt_t>& info, + int& nbits_processed) override; /*! * Returns the length of the formatted header in bits. */ - virtual size_t header_nbits() const; + size_t header_nbits() const override; /*! * Updates the access code. Must be a string of 1's and 0's and @@ -188,18 +188,18 @@ protected: int d_nbits; //!< num bits processed since reset //! Access code found, start getting the header - virtual void enter_have_sync(); + void enter_have_sync() override; //! Header found, setup for pulling in the hard decision bits - virtual void enter_have_header(int payload_len); + void enter_have_header(int payload_len) override; //! Verify that the header is valid - virtual bool header_ok(); + bool header_ok() override; /*! Get info from the header; return payload length and package * rest of data in d_info dictionary. */ - virtual int header_payload(); + int header_payload() override; }; } // namespace digital diff --git a/gr-digital/include/gnuradio/digital/header_format_ofdm.h b/gr-digital/include/gnuradio/digital/header_format_ofdm.h index 308b5f60ed..bfa143bb12 100644 --- a/gr-digital/include/gnuradio/digital/header_format_ofdm.h +++ b/gr-digital/include/gnuradio/digital/header_format_ofdm.h @@ -55,7 +55,7 @@ public: int bits_per_header_sym = 1, int bits_per_payload_sym = 1, bool scramble_header = false); - virtual ~header_format_ofdm(); + ~header_format_ofdm() override; /*! * \brief Encodes the header information in the given tags into @@ -68,20 +68,20 @@ public: * - Bits 12-23: The header number (counts up everytime this function is called) * - Bit 24-31: 8-Bit CRC */ - virtual bool format(int nbytes_in, - const unsigned char* input, - pmt::pmt_t& output, - pmt::pmt_t& info); + bool format(int nbytes_in, + const unsigned char* input, + pmt::pmt_t& output, + pmt::pmt_t& info) override; - virtual bool parse(int nbits_in, - const unsigned char* input, - std::vector<pmt::pmt_t>& info, - int& nbits_processed); + bool parse(int nbits_in, + const unsigned char* input, + std::vector<pmt::pmt_t>& info, + int& nbits_processed) override; /*! * Returns the length of the formatted header in bits. */ - virtual size_t header_nbits() const; + size_t header_nbits() const override; /*! * Factory to create an async packet header formatter; returns @@ -109,7 +109,7 @@ protected: /*! Get info from the header; return payload length and package * rest of data in d_info dictionary. */ - virtual int header_payload(); + int header_payload() override; }; } // namespace digital diff --git a/gr-digital/include/gnuradio/digital/mpsk_snr_est.h b/gr-digital/include/gnuradio/digital/mpsk_snr_est.h index 2d4d9b582c..6b29687ae8 100644 --- a/gr-digital/include/gnuradio/digital/mpsk_snr_est.h +++ b/gr-digital/include/gnuradio/digital/mpsk_snr_est.h @@ -100,10 +100,10 @@ public: * calculations. */ mpsk_snr_est_simple(double alpha); - ~mpsk_snr_est_simple() {} + ~mpsk_snr_est_simple() override {} - int update(int noutput_items, const gr_complex* input); - double snr(); + int update(int noutput_items, const gr_complex* input) override; + double snr() override; }; @@ -133,10 +133,10 @@ public: * calculations. */ mpsk_snr_est_skew(double alpha); - ~mpsk_snr_est_skew() {} + ~mpsk_snr_est_skew() override {} - int update(int noutput_items, const gr_complex* input); - double snr(); + int update(int noutput_items, const gr_complex* input) override; + double snr() override; }; @@ -169,10 +169,10 @@ public: * calculations. */ mpsk_snr_est_m2m4(double alpha); - ~mpsk_snr_est_m2m4() {} + ~mpsk_snr_est_m2m4() override {} - int update(int noutput_items, const gr_complex* input); - double snr(); + int update(int noutput_items, const gr_complex* input) override; + double snr() override; }; @@ -223,10 +223,10 @@ public: * \param kw: estimate of the channel noise kurtosis (2 for AWGN) */ snr_est_m2m4(double alpha, double ka, double kw); - ~snr_est_m2m4() {} + ~snr_est_m2m4() override {} - int update(int noutput_items, const gr_complex* input); - double snr(); + int update(int noutput_items, const gr_complex* input) override; + double snr() override; }; @@ -264,10 +264,10 @@ public: * calculations. */ mpsk_snr_est_svr(double alpha); - ~mpsk_snr_est_svr() {} + ~mpsk_snr_est_svr() override {} - int update(int noutput_items, const gr_complex* input); - double snr(); + int update(int noutput_items, const gr_complex* input) override; + double snr() override; }; } /* namespace digital */ diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h index 328523295f..346c97686d 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h @@ -83,10 +83,10 @@ public: const std::vector<std::vector<gr_complex>>& pilot_symbols, int symbols_skipped, bool input_is_shifted); - ~ofdm_equalizer_1d_pilots(); + ~ofdm_equalizer_1d_pilots() override; - void reset(); - void get_channel_state(std::vector<gr_complex>& taps); + void reset() override; + void get_channel_state(std::vector<gr_complex>& taps) override; }; } /* namespace digital */ diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h index 725ef7c6c8..6d485f2871 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h @@ -70,12 +70,12 @@ public: bool input_is_shifted = true, bool enable_soft_output = false); - ~ofdm_equalizer_simpledfe(); + ~ofdm_equalizer_simpledfe() override; void equalize(gr_complex* frame, int n_sym, const std::vector<gr_complex>& initial_taps = std::vector<gr_complex>(), - const std::vector<tag_t>& tags = std::vector<tag_t>()); + const std::vector<tag_t>& tags = std::vector<tag_t>()) override; /* * \param fft_len FFT length diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h index 39ef12e793..a4852eaeee 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h @@ -45,7 +45,7 @@ public: std::vector<std::vector<gr_complex>>(), int symbols_skipped = 0, bool input_is_shifted = true); - ~ofdm_equalizer_static(); + ~ofdm_equalizer_static() override; /*! \brief Divide the input signal with the current channel state. * @@ -57,7 +57,7 @@ public: void equalize(gr_complex* frame, int n_sym, const std::vector<gr_complex>& initial_taps = std::vector<gr_complex>(), - const std::vector<tag_t>& tags = std::vector<tag_t>()); + const std::vector<tag_t>& tags = std::vector<tag_t>()) override; /* * \param fft_len FFT length diff --git a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h index 7599849f70..3ebb780977 100644 --- a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h +++ b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h @@ -34,7 +34,7 @@ public: int bits_per_header_sym, int bits_per_payload_sym, bool scramble_header); - ~packet_header_ofdm(); + ~packet_header_ofdm() override; /*! * \brief Header formatter. @@ -43,8 +43,9 @@ public: * optionally scrambles the bits (this is more important for OFDM to avoid * PAPR spikes). */ - bool - header_formatter(long packet_len, unsigned char* out, const std::vector<tag_t>& tags); + bool header_formatter(long packet_len, + unsigned char* out, + const std::vector<tag_t>& tags) override; /*! * \brief Inverse function to header_formatter(). @@ -56,7 +57,7 @@ public: * of OFDM symbols and the packet length because a packet might * finish mid-OFDM-symbol. */ - bool header_parser(const unsigned char* header, std::vector<tag_t>& tags); + bool header_parser(const unsigned char* header, std::vector<tag_t>& tags) override; /*! * \param occupied_carriers See carrier allocator diff --git a/gr-digital/lib/additive_scrambler_bb_impl.h b/gr-digital/lib/additive_scrambler_bb_impl.h index da28a1ac95..bce86dcf80 100644 --- a/gr-digital/lib/additive_scrambler_bb_impl.h +++ b/gr-digital/lib/additive_scrambler_bb_impl.h @@ -37,13 +37,13 @@ public: int count = 0, int bits_per_byte = 1, const std::string& reset_tag_key = ""); - ~additive_scrambler_bb_impl(); + ~additive_scrambler_bb_impl() override; - int mask() const; - int seed() const; - int len() const; - int count() const; - int bits_per_byte() { return d_bits_per_byte; }; + int mask() const override; + int seed() const override; + int len() const override; + int count() const override; + int bits_per_byte() override { return d_bits_per_byte; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/binary_slicer_fb_impl.h b/gr-digital/lib/binary_slicer_fb_impl.h index 7bdc738ebb..776f00d190 100644 --- a/gr-digital/lib/binary_slicer_fb_impl.h +++ b/gr-digital/lib/binary_slicer_fb_impl.h @@ -20,7 +20,7 @@ class binary_slicer_fb_impl : public binary_slicer_fb { public: binary_slicer_fb_impl(); - ~binary_slicer_fb_impl(); + ~binary_slicer_fb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/burst_shaper_impl.h b/gr-digital/lib/burst_shaper_impl.h index a0d7d6d65c..ec7afb2193 100644 --- a/gr-digital/lib/burst_shaper_impl.h +++ b/gr-digital/lib/burst_shaper_impl.h @@ -63,7 +63,7 @@ public: int post_padding, bool insert_phasing, const std::string& length_tag_name); - ~burst_shaper_impl(); + ~burst_shaper_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; @@ -71,10 +71,10 @@ public: gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - int pre_padding() const { return d_nprepad; } - int post_padding() const { return d_npostpad; } - int prefix_length() const; - int suffix_length() const; + int pre_padding() const override { return d_nprepad; } + int post_padding() const override { return d_npostpad; } + int prefix_length() const override; + int suffix_length() const override; }; } // namespace digital diff --git a/gr-digital/lib/chunks_to_symbols_impl.h b/gr-digital/lib/chunks_to_symbols_impl.h index c66059538a..a16b05a703 100644 --- a/gr-digital/lib/chunks_to_symbols_impl.h +++ b/gr-digital/lib/chunks_to_symbols_impl.h @@ -26,19 +26,22 @@ private: public: chunks_to_symbols_impl(const std::vector<OUT_T>& symbol_table, const int D = 1); - ~chunks_to_symbols_impl(); + ~chunks_to_symbols_impl() override; void handle_set_symbol_table(pmt::pmt_t symbol_table_pmt); - void set_symbol_table(const std::vector<OUT_T>& symbol_table); + void set_symbol_table(const std::vector<OUT_T>& symbol_table) override; - int D() const { return d_D; } - std::vector<OUT_T> symbol_table() const { return d_symbol_table; } + int D() const override { return d_D; } + std::vector<OUT_T> symbol_table() const override { return d_symbol_table; } int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } + bool check_topology(int ninputs, int noutputs) override + { + return ninputs == noutputs; + } }; } /* namespace digital */ diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.h b/gr-digital/lib/clock_recovery_mm_cc_impl.h index e2fc479af1..af9dff1905 100644 --- a/gr-digital/lib/clock_recovery_mm_cc_impl.h +++ b/gr-digital/lib/clock_recovery_mm_cc_impl.h @@ -25,7 +25,7 @@ public: float mu, float gain_mu, float omega_relative_limi); - ~clock_recovery_mm_cc_impl(); + ~clock_recovery_mm_cc_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, @@ -33,16 +33,16 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - float mu() const { return d_mu; } - float omega() const { return d_omega; } - float gain_mu() const { return d_gain_mu; } - float gain_omega() const { return d_gain_omega; } + float mu() const override { return d_mu; } + float omega() const override { return d_omega; } + float gain_mu() const override { return d_gain_mu; } + float gain_omega() const override { return d_gain_omega; } - void set_verbose(bool verbose) { d_verbose = verbose; } - void set_gain_mu(float gain_mu) { d_gain_mu = gain_mu; } - void set_gain_omega(float gain_omega) { d_gain_omega = gain_omega; } - void set_mu(float mu) { d_mu = mu; } - void set_omega(float omega); + void set_verbose(bool verbose) override { d_verbose = verbose; } + void set_gain_mu(float gain_mu) override { d_gain_mu = gain_mu; } + void set_gain_omega(float gain_omega) override { d_gain_omega = gain_omega; } + void set_mu(float mu) override { d_mu = mu; } + void set_omega(float omega) override; private: float d_mu; // fractional sample position [0.0, 1.0] diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.h b/gr-digital/lib/clock_recovery_mm_ff_impl.h index 3ff8a5bb2d..7bdb1b9f3b 100644 --- a/gr-digital/lib/clock_recovery_mm_ff_impl.h +++ b/gr-digital/lib/clock_recovery_mm_ff_impl.h @@ -25,7 +25,7 @@ public: float mu, float gain_mu, float omega_relative_limi); - ~clock_recovery_mm_ff_impl(); + ~clock_recovery_mm_ff_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, @@ -33,16 +33,16 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - float mu() const { return d_mu; } - float omega() const { return d_omega; } - float gain_mu() const { return d_gain_mu; } - float gain_omega() const { return d_gain_omega; } + float mu() const override { return d_mu; } + float omega() const override { return d_omega; } + float gain_mu() const override { return d_gain_mu; } + float gain_omega() const override { return d_gain_omega; } - void set_verbose(bool verbose) { d_verbose = verbose; } - void set_gain_mu(float gain_mu) { d_gain_mu = gain_mu; } - void set_gain_omega(float gain_omega) { d_gain_omega = gain_omega; } - void set_mu(float mu) { d_mu = mu; } - void set_omega(float omega); + void set_verbose(bool verbose) override { d_verbose = verbose; } + void set_gain_mu(float gain_mu) override { d_gain_mu = gain_mu; } + void set_gain_omega(float gain_omega) override { d_gain_omega = gain_omega; } + void set_mu(float mu) override { d_mu = mu; } + void set_omega(float omega) override; private: float d_mu; // fractional sample position [0.0, 1.0] diff --git a/gr-digital/lib/cma_equalizer_cc_impl.h b/gr-digital/lib/cma_equalizer_cc_impl.h index 24844cc2e1..8f4264e0e8 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.h +++ b/gr-digital/lib/cma_equalizer_cc_impl.h @@ -30,19 +30,19 @@ private: float d_mu; protected: - gr_complex error(const gr_complex& out); - void update_tap(gr_complex& tap, const gr_complex& in); + gr_complex error(const gr_complex& out) override; + void update_tap(gr_complex& tap, const gr_complex& in) override; public: cma_equalizer_cc_impl(int num_taps, float modulus, float mu, int sps); - ~cma_equalizer_cc_impl(); + ~cma_equalizer_cc_impl() override; - void set_taps(const std::vector<gr_complex>& taps); - std::vector<gr_complex> taps() const; + void set_taps(const std::vector<gr_complex>& taps) override; + std::vector<gr_complex> taps() const override; - float gain() const { return d_mu; } + float gain() const override { return d_mu; } - void set_gain(float mu) + void set_gain(float mu) override { if (mu < 0.0f || mu > 1.0f) { throw std::out_of_range( @@ -51,9 +51,9 @@ public: d_mu = mu; } - float modulus() const { return d_modulus; } + float modulus() const override { return d_modulus; } - void set_modulus(float mod) + void set_modulus(float mod) override { if (mod < 0) throw std::out_of_range( diff --git a/gr-digital/lib/constellation_decoder_cb_impl.h b/gr-digital/lib/constellation_decoder_cb_impl.h index 6576ec4753..88c631914c 100644 --- a/gr-digital/lib/constellation_decoder_cb_impl.h +++ b/gr-digital/lib/constellation_decoder_cb_impl.h @@ -24,7 +24,7 @@ private: public: constellation_decoder_cb_impl(constellation_sptr constellation); - ~constellation_decoder_cb_impl(); + ~constellation_decoder_cb_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h index 96addf0198..33a2fafa7e 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.h +++ b/gr-digital/lib/constellation_receiver_cb_impl.h @@ -27,9 +27,9 @@ public: float fmin, float fmax); - ~constellation_receiver_cb_impl(); + ~constellation_receiver_cb_impl() override; - void setup_rpc(); + void setup_rpc() override; int general_work(int noutput_items, gr_vector_int& ninput_items, @@ -37,7 +37,7 @@ public: gr_vector_void_star& output_items) override; protected: - void phase_error_tracking(float phase_error); + void phase_error_tracking(float phase_error) override; private: constellation_sptr d_constellation; diff --git a/gr-digital/lib/constellation_soft_decoder_cf_impl.h b/gr-digital/lib/constellation_soft_decoder_cf_impl.h index e239d0191e..e37e8e3642 100644 --- a/gr-digital/lib/constellation_soft_decoder_cf_impl.h +++ b/gr-digital/lib/constellation_soft_decoder_cf_impl.h @@ -25,7 +25,7 @@ private: public: constellation_soft_decoder_cf_impl(constellation_sptr constellation); - ~constellation_soft_decoder_cf_impl(); + ~constellation_soft_decoder_cf_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/corr_est_cc_impl.h b/gr-digital/lib/corr_est_cc_impl.h index f72c2a20ad..0303d22369 100644 --- a/gr-digital/lib/corr_est_cc_impl.h +++ b/gr-digital/lib/corr_est_cc_impl.h @@ -48,16 +48,16 @@ public: unsigned int mark_delay, float threshold = 0.9, tm_type threshold_method = THRESHOLD_ABSOLUTE); - ~corr_est_cc_impl(); + ~corr_est_cc_impl() override; - std::vector<gr_complex> symbols() const; - void set_symbols(const std::vector<gr_complex>& symbols); + std::vector<gr_complex> symbols() const override; + void set_symbols(const std::vector<gr_complex>& symbols) override; - unsigned int mark_delay() const; - void set_mark_delay(unsigned int mark_delay); + unsigned int mark_delay() const override; + void set_mark_delay(unsigned int mark_delay) override; - float threshold() const; - void set_threshold(float threshold); + float threshold() const override; + void set_threshold(float threshold) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/correlate_access_code_bb_impl.h b/gr-digital/lib/correlate_access_code_bb_impl.h index adacd75ea1..f4b7ae9d71 100644 --- a/gr-digital/lib/correlate_access_code_bb_impl.h +++ b/gr-digital/lib/correlate_access_code_bb_impl.h @@ -30,13 +30,13 @@ private: public: correlate_access_code_bb_impl(const std::string& access_code, int threshold); - ~correlate_access_code_bb_impl(); + ~correlate_access_code_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool set_access_code(const std::string& access_code); + bool set_access_code(const std::string& access_code) override; }; } /* namespace digital */ diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.h b/gr-digital/lib/correlate_access_code_bb_ts_impl.h index b7102d05a4..ae0afced43 100644 --- a/gr-digital/lib/correlate_access_code_bb_ts_impl.h +++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.h @@ -50,15 +50,15 @@ public: correlate_access_code_bb_ts_impl(const std::string& access_code, int threshold, const std::string& tag_name); - ~correlate_access_code_bb_ts_impl(); + ~correlate_access_code_bb_ts_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool set_access_code(const std::string& access_code); - unsigned long long access_code() const; + bool set_access_code(const std::string& access_code) override; + unsigned long long access_code() const override; }; } /* namespace digital */ diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.h b/gr-digital/lib/correlate_access_code_ff_ts_impl.h index 828fe6eb10..eb9b22c217 100644 --- a/gr-digital/lib/correlate_access_code_ff_ts_impl.h +++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.h @@ -50,15 +50,15 @@ public: correlate_access_code_ff_ts_impl(const std::string& access_code, int threshold, const std::string& tag_name); - ~correlate_access_code_ff_ts_impl(); + ~correlate_access_code_ff_ts_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool set_access_code(const std::string& access_code); - unsigned long long access_code() const; + bool set_access_code(const std::string& access_code) override; + unsigned long long access_code() const override; }; } /* namespace digital */ diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.h b/gr-digital/lib/correlate_access_code_tag_bb_impl.h index a7c40dd142..78b652b0b2 100644 --- a/gr-digital/lib/correlate_access_code_tag_bb_impl.h +++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.h @@ -36,15 +36,15 @@ public: correlate_access_code_tag_bb_impl(const std::string& access_code, int threshold, const std::string& tag_name); - ~correlate_access_code_tag_bb_impl(); + ~correlate_access_code_tag_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool set_access_code(const std::string& access_code); - void set_threshold(int threshold) { d_threshold = threshold; }; - void set_tagname(const std::string& tag_name) + bool set_access_code(const std::string& access_code) override; + void set_threshold(int threshold) override { d_threshold = threshold; }; + void set_tagname(const std::string& tag_name) override { d_key = pmt::string_to_symbol(tag_name); }; diff --git a/gr-digital/lib/correlate_access_code_tag_ff_impl.h b/gr-digital/lib/correlate_access_code_tag_ff_impl.h index 2775a42bfc..d882c0f6b4 100644 --- a/gr-digital/lib/correlate_access_code_tag_ff_impl.h +++ b/gr-digital/lib/correlate_access_code_tag_ff_impl.h @@ -36,15 +36,15 @@ public: correlate_access_code_tag_ff_impl(const std::string& access_code, int threshold, const std::string& tag_name); - ~correlate_access_code_tag_ff_impl(); + ~correlate_access_code_tag_ff_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool set_access_code(const std::string& access_code); - void set_threshold(int threshold) { d_threshold = threshold; }; - void set_tagname(const std::string& tag_name) + bool set_access_code(const std::string& access_code) override; + void set_threshold(int threshold) override { d_threshold = threshold; }; + void set_tagname(const std::string& tag_name) override { d_key = pmt::string_to_symbol(tag_name); }; diff --git a/gr-digital/lib/costas_loop_cc_impl.h b/gr-digital/lib/costas_loop_cc_impl.h index 877ebd8a80..8c8eed9e62 100644 --- a/gr-digital/lib/costas_loop_cc_impl.h +++ b/gr-digital/lib/costas_loop_cc_impl.h @@ -126,13 +126,13 @@ private: public: costas_loop_cc_impl(float loop_bw, unsigned int order, bool use_snr = false); - ~costas_loop_cc_impl(); + ~costas_loop_cc_impl() override; - float error() const { return d_error; }; + float error() const override { return d_error; }; void handle_set_noise(pmt::pmt_t msg); - void setup_rpc(); + void setup_rpc() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h index cee2f2dc9b..435a23451b 100644 --- a/gr-digital/lib/cpmmod_bc_impl.h +++ b/gr-digital/lib/cpmmod_bc_impl.h @@ -41,14 +41,14 @@ public: int samples_per_sym, int L, double beta = 0.3); - ~cpmmod_bc_impl(); - - std::vector<float> taps() const; - int type() const; - float index() const; - int samples_per_sym() const; - int length() const; - double beta() const; + ~cpmmod_bc_impl() override; + + std::vector<float> taps() const override; + int type() const override; + float index() const override; + int samples_per_sym() const override; + int length() const override; + double beta() const override; }; } /* namespace digital */ diff --git a/gr-digital/lib/crc32_async_bb_impl.h b/gr-digital/lib/crc32_async_bb_impl.h index f759af5ca4..a918c8cd21 100644 --- a/gr-digital/lib/crc32_async_bb_impl.h +++ b/gr-digital/lib/crc32_async_bb_impl.h @@ -30,7 +30,7 @@ private: public: crc32_async_bb_impl(bool check); - ~crc32_async_bb_impl(); + ~crc32_async_bb_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/crc32_bb_impl.h b/gr-digital/lib/crc32_bb_impl.h index 6c86d985e2..8207697f81 100644 --- a/gr-digital/lib/crc32_bb_impl.h +++ b/gr-digital/lib/crc32_bb_impl.h @@ -29,9 +29,9 @@ private: public: crc32_bb_impl(bool check, const std::string& lengthtagname, bool packed); - ~crc32_bb_impl(); + ~crc32_bb_impl() override; - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; int work(int noutput_items, gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.h b/gr-digital/lib/decision_feedback_equalizer_impl.h index 55e78c1a56..0e7a0d21f8 100644 --- a/gr-digital/lib/decision_feedback_equalizer_impl.h +++ b/gr-digital/lib/decision_feedback_equalizer_impl.h @@ -51,12 +51,12 @@ public: bool adapt_after_training, std::vector<gr_complex> training_sequence, const std::string& training_start_tag); - ~decision_feedback_equalizer_impl() {} + ~decision_feedback_equalizer_impl() override {} void update_decision_history(gr_complex decision); - void set_taps(const std::vector<gr_complex>& taps); - std::vector<gr_complex> taps() const; + void set_taps(const std::vector<gr_complex>& taps) override; + std::vector<gr_complex> taps() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, @@ -71,7 +71,7 @@ public: std::vector<unsigned int> training_start_samples, bool history_included, gr_complex* taps, - unsigned short* state); + unsigned short* state) override; }; } // namespace digital diff --git a/gr-digital/lib/descrambler_bb_impl.h b/gr-digital/lib/descrambler_bb_impl.h index 7da4386afc..41d8d9c3c8 100644 --- a/gr-digital/lib/descrambler_bb_impl.h +++ b/gr-digital/lib/descrambler_bb_impl.h @@ -24,7 +24,7 @@ private: public: descrambler_bb_impl(int mask, int seed, int len); - ~descrambler_bb_impl(); + ~descrambler_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/diff_decoder_bb_impl.h b/gr-digital/lib/diff_decoder_bb_impl.h index 8c77703380..10688f427f 100644 --- a/gr-digital/lib/diff_decoder_bb_impl.h +++ b/gr-digital/lib/diff_decoder_bb_impl.h @@ -21,7 +21,7 @@ class diff_decoder_bb_impl : public diff_decoder_bb { public: diff_decoder_bb_impl(unsigned int modulus); - ~diff_decoder_bb_impl(); + ~diff_decoder_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/diff_encoder_bb_impl.h b/gr-digital/lib/diff_encoder_bb_impl.h index 8bc53a0b63..ed8ead0330 100644 --- a/gr-digital/lib/diff_encoder_bb_impl.h +++ b/gr-digital/lib/diff_encoder_bb_impl.h @@ -20,7 +20,7 @@ class diff_encoder_bb_impl : public diff_encoder_bb { public: diff_encoder_bb_impl(unsigned int modulus); - ~diff_encoder_bb_impl(); + ~diff_encoder_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/diff_phasor_cc_impl.h b/gr-digital/lib/diff_phasor_cc_impl.h index 87f7621460..b05ca283d9 100644 --- a/gr-digital/lib/diff_phasor_cc_impl.h +++ b/gr-digital/lib/diff_phasor_cc_impl.h @@ -21,7 +21,7 @@ class diff_phasor_cc_impl : public diff_phasor_cc { public: diff_phasor_cc_impl(); - ~diff_phasor_cc_impl(); + ~diff_phasor_cc_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h index 87cefe1daa..c236a500a5 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.h +++ b/gr-digital/lib/fll_band_edge_cc_impl.h @@ -47,15 +47,15 @@ public: int filter_size, float bandwidth); - void set_samples_per_symbol(float sps); - void set_rolloff(float rolloff); - void set_filter_size(int filter_size); + void set_samples_per_symbol(float sps) override; + void set_rolloff(float rolloff) override; + void set_filter_size(int filter_size) override; - float samples_per_symbol() const; - float rolloff() const; - int filter_size() const; + float samples_per_symbol() const override; + float rolloff() const override; + int filter_size() const override; - void print_taps(); + void print_taps() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/framer_sink_1_impl.h b/gr-digital/lib/framer_sink_1_impl.h index 729e840c60..78320c8262 100644 --- a/gr-digital/lib/framer_sink_1_impl.h +++ b/gr-digital/lib/framer_sink_1_impl.h @@ -58,7 +58,7 @@ protected: public: framer_sink_1_impl(msg_queue::sptr target_queue); - ~framer_sink_1_impl(); + ~framer_sink_1_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/glfsr_source_b_impl.h b/gr-digital/lib/glfsr_source_b_impl.h index 2dd9d8057c..108f3b8c8f 100644 --- a/gr-digital/lib/glfsr_source_b_impl.h +++ b/gr-digital/lib/glfsr_source_b_impl.h @@ -31,14 +31,14 @@ public: bool repeat = true, uint32_t mask = 0, uint32_t seed = 0x1); - ~glfsr_source_b_impl(); + ~glfsr_source_b_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - uint32_t period() const { return d_length; } - uint32_t mask() const; + uint32_t period() const override { return d_length; } + uint32_t mask() const override; }; } /* namespace digital */ diff --git a/gr-digital/lib/glfsr_source_f_impl.h b/gr-digital/lib/glfsr_source_f_impl.h index 10d039fccd..8de9e89039 100644 --- a/gr-digital/lib/glfsr_source_f_impl.h +++ b/gr-digital/lib/glfsr_source_f_impl.h @@ -31,14 +31,14 @@ public: bool repeat = true, uint32_t mask = 0, uint32_t seed = 0x1); - ~glfsr_source_f_impl(); + ~glfsr_source_f_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - uint32_t period() const { return d_length; } - uint32_t mask() const; + uint32_t period() const override { return d_length; } + uint32_t mask() const override; }; } /* namespace digital */ diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.h b/gr-digital/lib/hdlc_deframer_bp_impl.h index a89fe40ef1..68bd001989 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.h +++ b/gr-digital/lib/hdlc_deframer_bp_impl.h @@ -32,7 +32,7 @@ private: public: hdlc_deframer_bp_impl(int length_min, int length_max); - ~hdlc_deframer_bp_impl(); + ~hdlc_deframer_bp_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-digital/lib/hdlc_framer_pb_impl.h b/gr-digital/lib/hdlc_framer_pb_impl.h index 0d8932d2b5..7a7783ab96 100644 --- a/gr-digital/lib/hdlc_framer_pb_impl.h +++ b/gr-digital/lib/hdlc_framer_pb_impl.h @@ -30,7 +30,7 @@ private: public: hdlc_framer_pb_impl(const std::string frame_tag_name); - ~hdlc_framer_pb_impl(); + ~hdlc_framer_pb_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-digital/lib/header_payload_demux_impl.h b/gr-digital/lib/header_payload_demux_impl.h index 063b3cd657..5acbe66b2b 100644 --- a/gr-digital/lib/header_payload_demux_impl.h +++ b/gr-digital/lib/header_payload_demux_impl.h @@ -98,7 +98,7 @@ public: const double samp_rate, const std::vector<std::string>& special_tags, const size_t header_padding); - ~header_payload_demux_impl(); + ~header_payload_demux_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; diff --git a/gr-digital/lib/interpolating_resampler.h b/gr-digital/lib/interpolating_resampler.h index 439b46ac3b..a478b92d4d 100644 --- a/gr-digital/lib/interpolating_resampler.h +++ b/gr-digital/lib/interpolating_resampler.h @@ -166,7 +166,7 @@ public: int nfilts = 32, const std::vector<float>& taps = std::vector<float>()); - virtual ~interpolating_resampler_ccf(){}; + ~interpolating_resampler_ccf() override{}; /*! * \brief Return an interpolated sample. @@ -228,7 +228,7 @@ public: int nfilts = 32, const std::vector<float>& taps = std::vector<float>()); - virtual ~interpolating_resampler_fff(){}; + ~interpolating_resampler_fff() override{}; /*! * \brief Return an interpolated sample. @@ -274,27 +274,27 @@ public: * derivative samples as well. */ interp_resampler_mmse_8tap_cc(bool derivative = false); - ~interp_resampler_mmse_8tap_cc(); + ~interp_resampler_mmse_8tap_cc() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex interpolate(const gr_complex input[], float mu) const; + gr_complex interpolate(const gr_complex input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex differentiate(const gr_complex input[], float mu) const; + gr_complex differentiate(const gr_complex input[], float mu) const override; private: filter::mmse_fir_interpolator_cc d_interp; @@ -322,27 +322,27 @@ public: * derivative samples as well. */ interp_resampler_mmse_8tap_ff(bool derivative = false); - ~interp_resampler_mmse_8tap_ff(); + ~interp_resampler_mmse_8tap_ff() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float interpolate(const float input[], float mu) const; + float interpolate(const float input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float differentiate(const float input[], float mu) const; + float differentiate(const float input[], float mu) const override; private: filter::mmse_fir_interpolator_ff d_interp; @@ -376,27 +376,27 @@ public: * derivative samples as well. */ interp_resampler_pfb_no_mf_cc(bool derivative = false, int nfilts = 128); - ~interp_resampler_pfb_no_mf_cc(); + ~interp_resampler_pfb_no_mf_cc() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex interpolate(const gr_complex input[], float mu) const; + gr_complex interpolate(const gr_complex input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex differentiate(const gr_complex input[], float mu) const; + gr_complex differentiate(const gr_complex input[], float mu) const override; private: int d_nfilters; @@ -429,27 +429,27 @@ public: * derivative samples as well. */ interp_resampler_pfb_no_mf_ff(bool derivative = false, int nfilts = 128); - ~interp_resampler_pfb_no_mf_ff(); + ~interp_resampler_pfb_no_mf_ff() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float interpolate(const float input[], float mu) const; + float interpolate(const float input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float differentiate(const float input[], float mu) const; + float differentiate(const float input[], float mu) const override; private: int d_nfilters; @@ -486,27 +486,27 @@ public: interp_resampler_pfb_mf_ccf(const std::vector<float>& taps, int nfilts = 32, bool derivative = false); - ~interp_resampler_pfb_mf_ccf(); + ~interp_resampler_pfb_mf_ccf() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex interpolate(const gr_complex input[], float mu) const; + gr_complex interpolate(const gr_complex input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - gr_complex differentiate(const gr_complex input[], float mu) const; + gr_complex differentiate(const gr_complex input[], float mu) const override; private: int d_nfilters; @@ -545,27 +545,27 @@ public: interp_resampler_pfb_mf_fff(const std::vector<float>& taps, int nfilts = 32, bool derivative = false); - ~interp_resampler_pfb_mf_fff(); + ~interp_resampler_pfb_mf_fff() override; /*! * \brief Return the number of taps used in any single FIR filtering * operation */ - unsigned int ntaps() const; + unsigned int ntaps() const override; /*! * \brief Return an interpolated sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float interpolate(const float input[], float mu) const; + float interpolate(const float input[], float mu) const override; /*! * \brief Return an interpolated derivative sample. * \param input Array of input samples of length ntaps(). * \param mu Intersample phase in the range [0.0, 1.0] samples. */ - float differentiate(const float input[], float mu) const; + float differentiate(const float input[], float mu) const override; private: int d_nfilters; diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.h b/gr-digital/lib/kurtotic_equalizer_cc_impl.h index f70cdc9dce..ff56a7b2bd 100644 --- a/gr-digital/lib/kurtotic_equalizer_cc_impl.h +++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.h @@ -40,7 +40,7 @@ private: } protected: - virtual gr_complex error(const gr_complex& out) + gr_complex error(const gr_complex& out) override { // p = E[|z|^2] // q = E[z^2] @@ -67,18 +67,18 @@ protected: return gr_complex(re, im); } - virtual void update_tap(gr_complex& tap, const gr_complex& in) + void update_tap(gr_complex& tap, const gr_complex& in) override { tap += d_mu * in * d_error; } public: kurtotic_equalizer_cc_impl(int num_taps, float mu); - ~kurtotic_equalizer_cc_impl(); + ~kurtotic_equalizer_cc_impl() override; - float gain() const { return d_mu; } + float gain() const override { return d_mu; } - void set_gain(float mu) + void set_gain(float mu) override { if (mu < 0) throw std::out_of_range( diff --git a/gr-digital/lib/linear_equalizer_impl.h b/gr-digital/lib/linear_equalizer_impl.h index 46c4632901..41de5af0ef 100644 --- a/gr-digital/lib/linear_equalizer_impl.h +++ b/gr-digital/lib/linear_equalizer_impl.h @@ -46,10 +46,10 @@ public: bool adapt_after_training, std::vector<gr_complex> training_sequence, const std::string& training_start_tag); - ~linear_equalizer_impl(){}; + ~linear_equalizer_impl() override{}; - void set_taps(const std::vector<gr_complex>& taps); - std::vector<gr_complex> taps() const; + void set_taps(const std::vector<gr_complex>& taps) override; + std::vector<gr_complex> taps() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, @@ -65,7 +65,7 @@ public: std::vector<unsigned int> training_start_samples = std::vector<unsigned int>(0), bool history_included = false, gr_complex* taps = nullptr, - unsigned short* state = nullptr); + unsigned short* state = nullptr) override; }; } // namespace digital diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.h b/gr-digital/lib/lms_dd_equalizer_cc_impl.h index a4d86a1114..4f5318b6a4 100644 --- a/gr-digital/lib/lms_dd_equalizer_cc_impl.h +++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.h @@ -30,19 +30,19 @@ private: constellation_sptr d_cnst; protected: - gr_complex error(const gr_complex& out); - void update_tap(gr_complex& tap, const gr_complex& in); + gr_complex error(const gr_complex& out) override; + void update_tap(gr_complex& tap, const gr_complex& in) override; public: lms_dd_equalizer_cc_impl(int num_taps, float mu, int sps, constellation_sptr cnst); - ~lms_dd_equalizer_cc_impl(); + ~lms_dd_equalizer_cc_impl() override; - void set_taps(const std::vector<gr_complex>& taps); - std::vector<gr_complex> taps() const; + void set_taps(const std::vector<gr_complex>& taps) override; + std::vector<gr_complex> taps() const override; - float gain() const { return d_mu; } + float gain() const override { return d_mu; } - void set_gain(float mu) + void set_gain(float mu) override { if (mu < 0.0f || mu > 1.0f) { throw std::out_of_range( diff --git a/gr-digital/lib/map_bb_impl.h b/gr-digital/lib/map_bb_impl.h index 094a83581e..265944f9f0 100644 --- a/gr-digital/lib/map_bb_impl.h +++ b/gr-digital/lib/map_bb_impl.h @@ -26,10 +26,10 @@ private: public: map_bb_impl(const std::vector<int>& map); - ~map_bb_impl(); + ~map_bb_impl() override; - void set_map(const std::vector<int>& map); - std::vector<int> map() const; + void set_map(const std::vector<int>& map) override; + std::vector<int> map() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/meas_evm_cc_impl.h b/gr-digital/lib/meas_evm_cc_impl.h index 502706847d..c1a4f7ddd7 100644 --- a/gr-digital/lib/meas_evm_cc_impl.h +++ b/gr-digital/lib/meas_evm_cc_impl.h @@ -26,7 +26,7 @@ private: public: meas_evm_cc_impl(constellation_sptr cons, evm_measurement_t meas_type); - ~meas_evm_cc_impl(); + ~meas_evm_cc_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.h b/gr-digital/lib/mpsk_snr_est_cc_impl.h index 94978756d4..4e7ed26fdf 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.h +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.h @@ -33,32 +33,32 @@ public: mpsk_snr_est_cc_impl(snr_est_type_t type, int tag_nsamples = 10000, double alpha = 0.001); - ~mpsk_snr_est_cc_impl(); + ~mpsk_snr_est_cc_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; //! Return the estimated signal-to-noise ratio in decibels - double snr(); + double snr() override; //! Return the type of estimator in use - snr_est_type_t type() const; + snr_est_type_t type() const override; //! Return how many samples between SNR tags - int tag_nsample() const; + int tag_nsample() const override; //! Get the running-average coefficient - double alpha() const; + double alpha() const override; //! Set type of estimator to use - void set_type(snr_est_type_t t); + void set_type(snr_est_type_t t) override; //! Set the number of samples between SNR tags - void set_tag_nsample(int n); + void set_tag_nsample(int n) override; //! Set the running-average coefficient - void set_alpha(double alpha); + void set_alpha(double alpha) override; }; } /* namespace digital */ diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.h b/gr-digital/lib/msk_timing_recovery_cc_impl.h index bca4199aa5..e499c04625 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.h +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.h @@ -33,7 +33,7 @@ private: public: msk_timing_recovery_cc_impl(float sps, float gain, float limit, int osps); - ~msk_timing_recovery_cc_impl(); + ~msk_timing_recovery_cc_impl() override; // Where all the action really happens void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; @@ -42,14 +42,14 @@ public: gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void set_gain(float gain); - float get_gain(void); + void set_gain(float gain) override; + float get_gain(void) override; - void set_limit(float limit); - float get_limit(void); + void set_limit(float limit) override; + float get_limit(void) override; - void set_sps(float sps); - float get_sps(void); + void set_sps(float sps) override; + float get_sps(void) override; }; } // namespace digital } // namespace gr diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h index e8b96f9ca2..cc1b3a02e8 100644 --- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h +++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h @@ -33,7 +33,7 @@ private: const bool d_output_is_shifted; protected: - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; public: ofdm_carrier_allocator_cvc_impl( @@ -44,12 +44,15 @@ public: const std::vector<std::vector<gr_complex>>& sync_words, const std::string& len_tag_key, const bool output_is_shifted); - ~ofdm_carrier_allocator_cvc_impl(); + ~ofdm_carrier_allocator_cvc_impl() override; - std::string len_tag_key() { return d_length_tag_key_str; }; + std::string len_tag_key() override { return d_length_tag_key_str; }; - const int fft_len() { return d_fft_len; }; - std::vector<std::vector<int>> occupied_carriers() { return d_occupied_carriers; }; + const int fft_len() override { return d_fft_len; }; + std::vector<std::vector<int>> occupied_carriers() override + { + return d_occupied_carriers; + }; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.h b/gr-digital/lib/ofdm_chanest_vcvc_impl.h index 4d60f1c090..eed755c9fb 100644 --- a/gr-digital/lib/ofdm_chanest_vcvc_impl.h +++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.h @@ -64,7 +64,7 @@ public: int eq_noise_red_len, int max_carr_offset, bool force_one_sync_symbol); - ~ofdm_chanest_vcvc_impl(); + ~ofdm_chanest_vcvc_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h index 1eb92fd9a7..1154d4db19 100644 --- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h +++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h @@ -43,14 +43,14 @@ private: const std::string d_len_tag_key; protected: - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; public: ofdm_cyclic_prefixer_impl(int fft_len, const std::vector<int>& cp_lengths, int rolloff_len, const std::string& len_tag_key); - ~ofdm_cyclic_prefixer_impl(); + ~ofdm_cyclic_prefixer_impl() override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h index ef96da7f89..64c422f61f 100644 --- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h +++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h @@ -27,7 +27,7 @@ private: protected: void parse_length_tags(const std::vector<std::vector<tag_t>>& tags, - gr_vector_int& n_input_items_reqd); + gr_vector_int& n_input_items_reqd) override; public: ofdm_frame_equalizer_vcvc_impl(ofdm_equalizer_base::sptr equalizer, @@ -35,7 +35,7 @@ public: const std::string& len_tag_key, bool propagate_channel_state, int fixed_frame_len); - ~ofdm_frame_equalizer_vcvc_impl(); + ~ofdm_frame_equalizer_vcvc_impl() override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.h b/gr-digital/lib/ofdm_serializer_vcc_impl.h index 9237e2a60c..e38f04a98c 100644 --- a/gr-digital/lib/ofdm_serializer_vcc_impl.h +++ b/gr-digital/lib/ofdm_serializer_vcc_impl.h @@ -33,8 +33,8 @@ protected: * Calculate the number of scalar complex symbols given a number of * OFDM symbols. */ - int calculate_output_stream_length(const gr_vector_int& ninput_items); - void update_length_tags(int n_produced, int n_ports); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; + void update_length_tags(int n_produced, int n_ports) override; public: ofdm_serializer_vcc_impl(int fft_len, @@ -44,7 +44,7 @@ public: int symbols_skipped, const std::string& carr_offset_key, bool input_is_shifted); - ~ofdm_serializer_vcc_impl(); + ~ofdm_serializer_vcc_impl() override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h index ea9f57b85c..c74b48db53 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h @@ -24,10 +24,10 @@ public: int cp_len, bool use_even_carriers, float threshold); - ~ofdm_sync_sc_cfb_impl(); + ~ofdm_sync_sc_cfb_impl() override; - virtual void set_threshold(float threshold); - virtual float threshold() const; + void set_threshold(float threshold) override; + float threshold() const override; private: gr::blocks::plateau_detector_fb::sptr d_plateau_detector; diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.h b/gr-digital/lib/packet_headergenerator_bb_impl.h index 22ac092ad7..d8276c4084 100644 --- a/gr-digital/lib/packet_headergenerator_bb_impl.h +++ b/gr-digital/lib/packet_headergenerator_bb_impl.h @@ -23,12 +23,12 @@ private: public: packet_headergenerator_bb_impl(const packet_header_default::sptr& header_formatter, const std::string& len_tag_key); - ~packet_headergenerator_bb_impl(); + ~packet_headergenerator_bb_impl() override; - void set_header_formatter(packet_header_default::sptr header_formatter); + void set_header_formatter(packet_header_default::sptr header_formatter) override; void remove_length_tags(const std::vector<std::vector<tag_t>>& tags){}; - int calculate_output_stream_length(const gr_vector_int& ninput_items) + int calculate_output_stream_length(const gr_vector_int& ninput_items) override { return d_formatter->header_len(); }; diff --git a/gr-digital/lib/packet_headerparser_b_impl.h b/gr-digital/lib/packet_headerparser_b_impl.h index c961335c93..fc2e270ffd 100644 --- a/gr-digital/lib/packet_headerparser_b_impl.h +++ b/gr-digital/lib/packet_headerparser_b_impl.h @@ -25,7 +25,7 @@ private: public: packet_headerparser_b_impl( const gr::digital::packet_header_default::sptr& header_formatter); - ~packet_headerparser_b_impl(); + ~packet_headerparser_b_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/packet_sink_impl.h b/gr-digital/lib/packet_sink_impl.h index 0f159a7be7..4bc0549034 100644 --- a/gr-digital/lib/packet_sink_impl.h +++ b/gr-digital/lib/packet_sink_impl.h @@ -65,14 +65,14 @@ public: packet_sink_impl(const std::vector<unsigned char>& sync_vector, msg_queue::sptr target_queue, int threshold = -1); - ~packet_sink_impl(); + ~packet_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; //! return true if we detect carrier - bool carrier_sensed() const { return d_state != STATE_SYNC_SEARCH; } + bool carrier_sensed() const override { return d_state != STATE_SYNC_SEARCH; } }; } /* namespace digital */ diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.h b/gr-digital/lib/pfb_clock_sync_ccf_impl.h index 34a8bc981c..ed7257ad8b 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.h +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.h @@ -64,36 +64,36 @@ public: float max_rate_deviation = 1.5, int osps = 1); - void setup_rpc(); + void setup_rpc() override; - void update_gains(); + void update_gains() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; - void update_taps(const std::vector<float>& taps); - - std::vector<std::vector<float>> taps() const; - std::vector<std::vector<float>> diff_taps() const; - std::vector<float> channel_taps(int channel) const; - std::vector<float> diff_channel_taps(int channel) const; - std::string taps_as_string() const; - std::string diff_taps_as_string() const; - - void set_loop_bandwidth(float bw); - void set_damping_factor(float df); - void set_alpha(float alpha); - void set_beta(float beta); - void set_max_rate_deviation(float m) { d_max_dev = m; } - - float loop_bandwidth() const; - float damping_factor() const; - float alpha() const; - float beta() const; - float clock_rate() const; - - float error() const; - float rate() const; - float phase() const; + void update_taps(const std::vector<float>& taps) override; + + std::vector<std::vector<float>> taps() const override; + std::vector<std::vector<float>> diff_taps() const override; + std::vector<float> channel_taps(int channel) const override; + std::vector<float> diff_channel_taps(int channel) const override; + std::string taps_as_string() const override; + std::string diff_taps_as_string() const override; + + void set_loop_bandwidth(float bw) override; + void set_damping_factor(float df) override; + void set_alpha(float alpha) override; + void set_beta(float beta) override; + void set_max_rate_deviation(float m) override { d_max_dev = m; } + + float loop_bandwidth() const override; + float damping_factor() const override; + float alpha() const override; + float beta() const override; + float clock_rate() const override; + + float error() const override; + float rate() const override; + float phase() const override; /******************************************************************* *******************************************************************/ diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.h b/gr-digital/lib/pfb_clock_sync_fff_impl.h index 66f197f459..6f31c7beb1 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.h +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.h @@ -61,33 +61,33 @@ public: float init_phase = 0, float max_rate_deviation = 1.5, int osps = 1); - ~pfb_clock_sync_fff_impl(); + ~pfb_clock_sync_fff_impl() override; - void update_gains(); + void update_gains() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; - void update_taps(const std::vector<float>& taps); + void update_taps(const std::vector<float>& taps) override; - std::vector<std::vector<float>> taps() const; - std::vector<std::vector<float>> diff_taps() const; - std::vector<float> channel_taps(int channel) const; - std::vector<float> diff_channel_taps(int channel) const; - std::string taps_as_string() const; - std::string diff_taps_as_string() const; + std::vector<std::vector<float>> taps() const override; + std::vector<std::vector<float>> diff_taps() const override; + std::vector<float> channel_taps(int channel) const override; + std::vector<float> diff_channel_taps(int channel) const override; + std::string taps_as_string() const override; + std::string diff_taps_as_string() const override; - void set_loop_bandwidth(float bw); - void set_damping_factor(float df); - void set_alpha(float alpha); - void set_beta(float beta); - void set_max_rate_deviation(float m) { d_max_dev = m; } + void set_loop_bandwidth(float bw) override; + void set_damping_factor(float df) override; + void set_alpha(float alpha) override; + void set_beta(float beta) override; + void set_max_rate_deviation(float m) override { d_max_dev = m; } - float loop_bandwidth() const; - float damping_factor() const; - float alpha() const; - float beta() const; - float clock_rate() const; + float loop_bandwidth() const override; + float damping_factor() const override; + float alpha() const override; + float beta() const override; + float clock_rate() const override; bool check_topology(int ninputs, int noutputs) override; diff --git a/gr-digital/lib/pn_correlator_cc_impl.h b/gr-digital/lib/pn_correlator_cc_impl.h index fc8b0b5184..4135179606 100644 --- a/gr-digital/lib/pn_correlator_cc_impl.h +++ b/gr-digital/lib/pn_correlator_cc_impl.h @@ -26,7 +26,7 @@ private: public: pn_correlator_cc_impl(int degree, int mask = 0, int seed = 1); - ~pn_correlator_cc_impl(); + ~pn_correlator_cc_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/probe_density_b_impl.h b/gr-digital/lib/probe_density_b_impl.h index 82dd43c7f9..95248744c1 100644 --- a/gr-digital/lib/probe_density_b_impl.h +++ b/gr-digital/lib/probe_density_b_impl.h @@ -23,17 +23,17 @@ private: public: probe_density_b_impl(double alpha); - ~probe_density_b_impl(); + ~probe_density_b_impl() override; /*! * \brief Returns the current density value */ - double density() const { return d_density; } + double density() const override { return d_density; } /*! * \brief Set the average filter constant */ - void set_alpha(double alpha); + void set_alpha(double alpha) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.h b/gr-digital/lib/probe_mpsk_snr_est_c_impl.h index 6ff7b6fe1d..e18c87a13a 100644 --- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.h +++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.h @@ -34,38 +34,38 @@ public: int msg_nsamples = 10000, double alpha = 0.001); - ~probe_mpsk_snr_est_c_impl(); + ~probe_mpsk_snr_est_c_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; //! Return the estimated signal-to-noise ratio in decibels - double snr(); + double snr() override; //! Return the estimated signal power in decibels - double signal(); + double signal() override; //! Return the estimated noise power in decibels - double noise(); + double noise() override; //! Return the type of estimator in use - snr_est_type_t type() const; + snr_est_type_t type() const override; //! Return how many samples between SNR messages - int msg_nsample() const; + int msg_nsample() const override; //! Get the running-average coefficient - double alpha() const; + double alpha() const override; //! Set type of estimator to use - void set_type(snr_est_type_t t); + void set_type(snr_est_type_t t) override; //! Set the number of samples between SNR messages - void set_msg_nsample(int n); + void set_msg_nsample(int n) override; //! Set the running-average coefficient - void set_alpha(double alpha); + void set_alpha(double alpha) override; }; } /* namespace digital */ diff --git a/gr-digital/lib/protocol_formatter_async_impl.h b/gr-digital/lib/protocol_formatter_async_impl.h index 8149db52fb..48918ed3b1 100644 --- a/gr-digital/lib/protocol_formatter_async_impl.h +++ b/gr-digital/lib/protocol_formatter_async_impl.h @@ -28,7 +28,7 @@ private: public: protocol_formatter_async_impl(const header_format_base::sptr& format); - ~protocol_formatter_async_impl(); + ~protocol_formatter_async_impl() override; }; } // namespace digital diff --git a/gr-digital/lib/protocol_formatter_bb_impl.h b/gr-digital/lib/protocol_formatter_bb_impl.h index f38771b5ce..c645664858 100644 --- a/gr-digital/lib/protocol_formatter_bb_impl.h +++ b/gr-digital/lib/protocol_formatter_bb_impl.h @@ -24,12 +24,12 @@ private: public: protocol_formatter_bb_impl(const header_format_base::sptr& format, const std::string& len_tag_key); - ~protocol_formatter_bb_impl(); + ~protocol_formatter_bb_impl() override; - void set_header_format(header_format_base::sptr& format); + void set_header_format(header_format_base::sptr& format) override; void remove_length_tags(const std::vector<std::vector<tag_t>>& tags){}; - int calculate_output_stream_length(const gr_vector_int& ninput_items) + int calculate_output_stream_length(const gr_vector_int& ninput_items) override { return d_format->header_nbytes(); }; diff --git a/gr-digital/lib/protocol_parser_b_impl.h b/gr-digital/lib/protocol_parser_b_impl.h index 490765fb0c..687c50fc06 100644 --- a/gr-digital/lib/protocol_parser_b_impl.h +++ b/gr-digital/lib/protocol_parser_b_impl.h @@ -24,7 +24,7 @@ private: public: protocol_parser_b_impl(const header_format_base::sptr& format); - ~protocol_parser_b_impl(); + ~protocol_parser_b_impl() override; void set_threshold(unsigned int thresh); unsigned int threshold() const; diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h index b9e9905543..2198d2a11b 100644 --- a/gr-digital/lib/scrambler_bb_impl.h +++ b/gr-digital/lib/scrambler_bb_impl.h @@ -25,7 +25,7 @@ private: public: scrambler_bb_impl(int mask, int seed, int len); - ~scrambler_bb_impl(); + ~scrambler_bb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-digital/lib/simple_correlator_impl.h b/gr-digital/lib/simple_correlator_impl.h index 7950ed5197..505a2e296d 100644 --- a/gr-digital/lib/simple_correlator_impl.h +++ b/gr-digital/lib/simple_correlator_impl.h @@ -73,7 +73,7 @@ private: public: simple_correlator_impl(int payload_bytesize); - ~simple_correlator_impl(); + ~simple_correlator_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-digital/lib/simple_framer_impl.h b/gr-digital/lib/simple_framer_impl.h index 05afa06911..5c4b9da676 100644 --- a/gr-digital/lib/simple_framer_impl.h +++ b/gr-digital/lib/simple_framer_impl.h @@ -25,7 +25,7 @@ private: public: simple_framer_impl(int payload_bytesize); - ~simple_framer_impl(); + ~simple_framer_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; diff --git a/gr-digital/lib/symbol_sync_cc_impl.h b/gr-digital/lib/symbol_sync_cc_impl.h index 0a44d04732..a59021cfe7 100644 --- a/gr-digital/lib/symbol_sync_cc_impl.h +++ b/gr-digital/lib/symbol_sync_cc_impl.h @@ -41,20 +41,20 @@ public: gr_vector_void_star& output_items) override; // Symbol Clock Tracking and Estimation - float loop_bandwidth() const { return d_clock.get_loop_bandwidth(); } - float damping_factor() const { return d_clock.get_damping_factor(); } - float ted_gain() const { return d_clock.get_ted_gain(); } - float alpha() const { return d_clock.get_alpha(); } - float beta() const { return d_clock.get_beta(); } + float loop_bandwidth() const override { return d_clock.get_loop_bandwidth(); } + float damping_factor() const override { return d_clock.get_damping_factor(); } + float ted_gain() const override { return d_clock.get_ted_gain(); } + float alpha() const override { return d_clock.get_alpha(); } + float beta() const override { return d_clock.get_beta(); } - void set_loop_bandwidth(float omega_n_norm) + void set_loop_bandwidth(float omega_n_norm) override { d_clock.set_loop_bandwidth(omega_n_norm); } - void set_damping_factor(float zeta) { d_clock.set_damping_factor(zeta); } - void set_ted_gain(float ted_gain) { d_clock.set_ted_gain(ted_gain); } - void set_alpha(float alpha) { d_clock.set_alpha(alpha); } - void set_beta(float beta) { d_clock.set_beta(beta); } + void set_damping_factor(float zeta) override { d_clock.set_damping_factor(zeta); } + void set_ted_gain(float ted_gain) override { d_clock.set_ted_gain(ted_gain); } + void set_alpha(float alpha) override { d_clock.set_alpha(alpha); } + void set_beta(float beta) override { d_clock.set_beta(beta); } private: // Timing Error Detector diff --git a/gr-digital/lib/symbol_sync_ff_impl.h b/gr-digital/lib/symbol_sync_ff_impl.h index 36a96d1923..30d99f8017 100644 --- a/gr-digital/lib/symbol_sync_ff_impl.h +++ b/gr-digital/lib/symbol_sync_ff_impl.h @@ -33,7 +33,7 @@ public: ir_type interp_type, int n_filters, const std::vector<float>& taps); - ~symbol_sync_ff_impl(); + ~symbol_sync_ff_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, @@ -42,20 +42,20 @@ public: gr_vector_void_star& output_items) override; // Symbol Clock Tracking and Estimation - float loop_bandwidth() const { return d_clock.get_loop_bandwidth(); } - float damping_factor() const { return d_clock.get_damping_factor(); } - float ted_gain() const { return d_clock.get_ted_gain(); } - float alpha() const { return d_clock.get_alpha(); } - float beta() const { return d_clock.get_beta(); } + float loop_bandwidth() const override { return d_clock.get_loop_bandwidth(); } + float damping_factor() const override { return d_clock.get_damping_factor(); } + float ted_gain() const override { return d_clock.get_ted_gain(); } + float alpha() const override { return d_clock.get_alpha(); } + float beta() const override { return d_clock.get_beta(); } - void set_loop_bandwidth(float omega_n_norm) + void set_loop_bandwidth(float omega_n_norm) override { d_clock.set_loop_bandwidth(omega_n_norm); } - void set_damping_factor(float zeta) { d_clock.set_damping_factor(zeta); } - void set_ted_gain(float ted_gain) { d_clock.set_ted_gain(ted_gain); } - void set_alpha(float alpha) { d_clock.set_alpha(alpha); } - void set_beta(float beta) { d_clock.set_beta(beta); } + void set_damping_factor(float zeta) override { d_clock.set_damping_factor(zeta); } + void set_ted_gain(float ted_gain) override { d_clock.set_ted_gain(ted_gain); } + void set_alpha(float alpha) override { d_clock.set_alpha(alpha); } + void set_beta(float beta) override { d_clock.set_beta(beta); } private: // Timing Error Detector diff --git a/gr-digital/lib/timing_error_detector.h b/gr-digital/lib/timing_error_detector.h index 439be37b78..7d11c9c99c 100644 --- a/gr-digital/lib/timing_error_detector.h +++ b/gr-digital/lib/timing_error_detector.h @@ -232,11 +232,11 @@ public: : timing_error_detector(TED_MUELLER_AND_MULLER, 1, 2, false, false, constellation) { } - ~ted_mueller_and_muller(){}; + ~ted_mueller_and_muller() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -270,11 +270,11 @@ public: TED_MOD_MUELLER_AND_MULLER, 1, 3, false, false, constellation) { } - ~ted_mod_mueller_and_muller(){}; + ~ted_mod_mueller_and_muller() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -297,11 +297,11 @@ public: : timing_error_detector(TED_ZERO_CROSSING, 2, 3, false, false, constellation) { } - ~ted_zero_crossing(){}; + ~ted_zero_crossing() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -325,11 +325,11 @@ public: : timing_error_detector(TED_GARDNER, 2, 3, false, false, constellation_sptr()) { } - ~ted_gardner(){}; + ~ted_gardner() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -351,11 +351,11 @@ public: : timing_error_detector(TED_EARLY_LATE, 2, 2, true, false, constellation_sptr()) { } - ~ted_early_late(){}; + ~ted_early_late() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -382,11 +382,11 @@ public: TED_DANDREA_AND_MENGALI_GEN_MSK, 2, 4, false, false, constellation_sptr()) { } - ~ted_generalized_msk(){}; + ~ted_generalized_msk() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -412,11 +412,11 @@ public: TED_MENGALI_AND_DANDREA_GMSK, 2, 4, false, false, constellation_sptr()) { } - ~ted_gaussian_msk(){}; + ~ted_gaussian_msk() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -447,11 +447,11 @@ public: TED_SIGNAL_TIMES_SLOPE_ML, 1, 1, false, true, constellation_sptr()) { } - ~ted_signal_times_slope_ml(){}; + ~ted_signal_times_slope_ml() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; /*! @@ -482,11 +482,11 @@ public: TED_SIGNUM_TIMES_SLOPE_ML, 1, 1, false, true, constellation_sptr()) { } - ~ted_signum_times_slope_ml(){}; + ~ted_signum_times_slope_ml() override{}; private: - float compute_error_cf(); - float compute_error_ff(); + float compute_error_cf() override; + float compute_error_ff() override; }; } /* namespace digital */ diff --git a/gr-digital/python/digital/bindings/adaptive_algorithm_cma_python.cc b/gr-digital/python/digital/bindings/adaptive_algorithm_cma_python.cc index 38d3e7c22c..a0a06a953f 100644 --- a/gr-digital/python/digital/bindings/adaptive_algorithm_cma_python.cc +++ b/gr-digital/python/digital/bindings/adaptive_algorithm_cma_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(adaptive_algorithm_cma.h) */ -/* BINDTOOL_HEADER_FILE_HASH(4f720d6c8ec33fbe77c05861a5913926) */ +/* BINDTOOL_HEADER_FILE_HASH(db6db4f2b808db300412b90c61b333b6) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/adaptive_algorithm_lms_python.cc b/gr-digital/python/digital/bindings/adaptive_algorithm_lms_python.cc index 384ea72a3d..b613316178 100644 --- a/gr-digital/python/digital/bindings/adaptive_algorithm_lms_python.cc +++ b/gr-digital/python/digital/bindings/adaptive_algorithm_lms_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(adaptive_algorithm_lms.h) */ -/* BINDTOOL_HEADER_FILE_HASH(d868d635d3649a954a45b63ad2f1d79a) */ +/* BINDTOOL_HEADER_FILE_HASH(f3725cfd42cb5687fe2b2191b78e96b6) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/adaptive_algorithm_nlms_python.cc b/gr-digital/python/digital/bindings/adaptive_algorithm_nlms_python.cc index b865504473..be7a2cdec2 100644 --- a/gr-digital/python/digital/bindings/adaptive_algorithm_nlms_python.cc +++ b/gr-digital/python/digital/bindings/adaptive_algorithm_nlms_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(adaptive_algorithm_nlms.h) */ -/* BINDTOOL_HEADER_FILE_HASH(814b418bc8a24090916095fb7702ceec) */ +/* BINDTOOL_HEADER_FILE_HASH(0759d4c6393c09f3491dd59647166c3a) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/constellation_python.cc b/gr-digital/python/digital/bindings/constellation_python.cc index 759502873a..77a252c42c 100644 --- a/gr-digital/python/digital/bindings/constellation_python.cc +++ b/gr-digital/python/digital/bindings/constellation_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(constellation.h) */ -/* BINDTOOL_HEADER_FILE_HASH(a4bdcaf2db30bfe32e518f4f4b62bafa) */ +/* BINDTOOL_HEADER_FILE_HASH(5f7cb544c3d7104e228f713f28b385ee) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/header_format_counter_python.cc b/gr-digital/python/digital/bindings/header_format_counter_python.cc index 8ae5561020..c98ea57dfa 100644 --- a/gr-digital/python/digital/bindings/header_format_counter_python.cc +++ b/gr-digital/python/digital/bindings/header_format_counter_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(header_format_counter.h) */ -/* BINDTOOL_HEADER_FILE_HASH(210ade4ec83c93cb6716145e4047bedc) */ +/* BINDTOOL_HEADER_FILE_HASH(893d5a7a587a1dcc3187d992040c1bfd) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/header_format_crc_python.cc b/gr-digital/python/digital/bindings/header_format_crc_python.cc index 760bad9eaa..5bf4d92c59 100644 --- a/gr-digital/python/digital/bindings/header_format_crc_python.cc +++ b/gr-digital/python/digital/bindings/header_format_crc_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(header_format_crc.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c7a584f39de1d567e582a4e91a5435c8) */ +/* BINDTOOL_HEADER_FILE_HASH(0a5a9ad1c6bc88eb23f7f65faac4b146) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/header_format_default_python.cc b/gr-digital/python/digital/bindings/header_format_default_python.cc index 2b69288483..9ba4215b08 100644 --- a/gr-digital/python/digital/bindings/header_format_default_python.cc +++ b/gr-digital/python/digital/bindings/header_format_default_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(header_format_default.h) */ -/* BINDTOOL_HEADER_FILE_HASH(f5ae2ad68689db8ee0e8acbf1b4312fc) */ +/* BINDTOOL_HEADER_FILE_HASH(70089203b446e9abeb685ef15f3091c9) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/header_format_ofdm_python.cc b/gr-digital/python/digital/bindings/header_format_ofdm_python.cc index 87c61a03f4..fbcb2a620e 100644 --- a/gr-digital/python/digital/bindings/header_format_ofdm_python.cc +++ b/gr-digital/python/digital/bindings/header_format_ofdm_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(header_format_ofdm.h) */ -/* BINDTOOL_HEADER_FILE_HASH(7d8d0984ec74f11d45ed283c841286fd) */ +/* BINDTOOL_HEADER_FILE_HASH(498bdcfe4bd8bf2202fecec7e1fef6bf) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/mpsk_snr_est_python.cc b/gr-digital/python/digital/bindings/mpsk_snr_est_python.cc index 448ae63d8a..88cc599dc5 100644 --- a/gr-digital/python/digital/bindings/mpsk_snr_est_python.cc +++ b/gr-digital/python/digital/bindings/mpsk_snr_est_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(mpsk_snr_est.h) */ -/* BINDTOOL_HEADER_FILE_HASH(d74db624965f372f65b7834c2402f1ee) */ +/* BINDTOOL_HEADER_FILE_HASH(d9ecc2af2d83ec2254bc299411d36403) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/ofdm_equalizer_base_python.cc b/gr-digital/python/digital/bindings/ofdm_equalizer_base_python.cc index a6a91032a0..ccb16477c7 100644 --- a/gr-digital/python/digital/bindings/ofdm_equalizer_base_python.cc +++ b/gr-digital/python/digital/bindings/ofdm_equalizer_base_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(ofdm_equalizer_base.h) */ -/* BINDTOOL_HEADER_FILE_HASH(65983532ef2b3a47c2c295e23fdbed37) */ +/* BINDTOOL_HEADER_FILE_HASH(b2953d675c157a3136348991d5e0d365) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/ofdm_equalizer_simpledfe_python.cc b/gr-digital/python/digital/bindings/ofdm_equalizer_simpledfe_python.cc index fcd939057f..e507079aeb 100644 --- a/gr-digital/python/digital/bindings/ofdm_equalizer_simpledfe_python.cc +++ b/gr-digital/python/digital/bindings/ofdm_equalizer_simpledfe_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(ofdm_equalizer_simpledfe.h) */ -/* BINDTOOL_HEADER_FILE_HASH(e484906ff9740a46f83b999ec69f511e) */ +/* BINDTOOL_HEADER_FILE_HASH(d4fd209e67a0c2a859e58dcea8ee907f) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/ofdm_equalizer_static_python.cc b/gr-digital/python/digital/bindings/ofdm_equalizer_static_python.cc index ba83419c91..99834c6fba 100644 --- a/gr-digital/python/digital/bindings/ofdm_equalizer_static_python.cc +++ b/gr-digital/python/digital/bindings/ofdm_equalizer_static_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(ofdm_equalizer_static.h) */ -/* BINDTOOL_HEADER_FILE_HASH(4afc931952b5aa291e61773cc4edfd61) */ +/* BINDTOOL_HEADER_FILE_HASH(be864641673599b8d6f99c36699ef0a0) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-digital/python/digital/bindings/packet_header_ofdm_python.cc b/gr-digital/python/digital/bindings/packet_header_ofdm_python.cc index 7e6a8f8713..3105a10183 100644 --- a/gr-digital/python/digital/bindings/packet_header_ofdm_python.cc +++ b/gr-digital/python/digital/bindings/packet_header_ofdm_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(packet_header_ofdm.h) */ -/* BINDTOOL_HEADER_FILE_HASH(9468930d7692df3db8194919f967cde5) */ +/* BINDTOOL_HEADER_FILE_HASH(444b1d69edea7e4d814e8d8e46e0016c) */ /***********************************************************************************/ #include <pybind11/complex.h> |