diff options
author | Marcus Müller <mmueller@gnuradio.org> | 2020-10-30 18:22:33 +0100 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-11-03 14:07:23 -0500 |
commit | 0ddc7dbc95ca6fb4c4a62a3c027104d6dd71fc3b (patch) | |
tree | b454053fdc123711f3011b8a703de38e1d783ba3 /gr-analog | |
parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-analog')
39 files changed, 300 insertions, 282 deletions
diff --git a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h index 4e7059cdb4..7bf39e9a74 100644 --- a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h @@ -25,8 +25,8 @@ namespace analog { class ANALOG_API ctcss_squelch_ff : public squelch_base_ff, virtual public block { protected: - virtual void update_state(const float& in) = 0; - virtual bool mute() const = 0; + void update_state(const float& in) override = 0; + bool mute() const override = 0; public: // gr::analog::ctcss_squelch_ff::sptr @@ -46,18 +46,18 @@ public: */ static sptr make(int rate, float freq, float level, int len, int ramp, bool gate); - virtual std::vector<float> squelch_range() const = 0; + std::vector<float> squelch_range() const override = 0; virtual float level() const = 0; virtual void set_level(float level) = 0; virtual int len() const = 0; virtual float frequency() const = 0; virtual void set_frequency(float frequency) = 0; - virtual int ramp() const = 0; - virtual void set_ramp(int ramp) = 0; - virtual bool gate() const = 0; - virtual void set_gate(bool gate) = 0; - virtual bool unmuted() const = 0; + int ramp() const override = 0; + void set_ramp(int ramp) override = 0; + bool gate() const override = 0; + void set_gate(bool gate) override = 0; + bool unmuted() const override = 0; }; } /* namespace analog */ diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index 5171bd37aa..cd3d2c70ae 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -54,7 +54,7 @@ public: virtual bool squelch_enable(bool) = 0; virtual float set_lock_threshold(float) = 0; - virtual void set_loop_bandwidth(float bw) = 0; + void set_loop_bandwidth(float bw) override = 0; virtual void set_damping_factor(float df) = 0; virtual void set_alpha(float alpha) = 0; virtual void set_beta(float beta) = 0; diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index 4c04fafef3..0abfe9adca 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -49,7 +49,7 @@ public: */ static sptr make(float loop_bw, float max_freq, float min_freq); - virtual void set_loop_bandwidth(float bw) = 0; + void set_loop_bandwidth(float bw) override = 0; virtual void set_damping_factor(float df) = 0; virtual void set_alpha(float alpha) = 0; virtual void set_beta(float beta) = 0; diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h index bf2ecc7331..7307e2399e 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h @@ -25,8 +25,8 @@ namespace analog { class ANALOG_API pwr_squelch_cc : public squelch_base_cc, virtual public block { protected: - virtual void update_state(const gr_complex& in) = 0; - virtual bool mute() const = 0; + void update_state(const gr_complex& in) override = 0; + bool mute() const override = 0; public: // gr::analog::pwr_squelch_cc::sptr @@ -48,17 +48,17 @@ public: */ static sptr make(double db, double alpha = 0.0001, int ramp = 0, bool gate = false); - virtual std::vector<float> squelch_range() const = 0; + std::vector<float> squelch_range() const override = 0; virtual double threshold() const = 0; virtual void set_threshold(double db) = 0; virtual void set_alpha(double alpha) = 0; - virtual int ramp() const = 0; - virtual void set_ramp(int ramp) = 0; - virtual bool gate() const = 0; - virtual void set_gate(bool gate) = 0; - virtual bool unmuted() const = 0; + int ramp() const override = 0; + void set_ramp(int ramp) override = 0; + bool gate() const override = 0; + void set_gate(bool gate) override = 0; + bool unmuted() const override = 0; }; } /* namespace analog */ diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h index d19b45e15d..a1d9e154bd 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h @@ -25,8 +25,8 @@ namespace analog { class ANALOG_API pwr_squelch_ff : public squelch_base_ff, virtual public block { protected: - virtual void update_state(const float& in) = 0; - virtual bool mute() const = 0; + void update_state(const float& in) override = 0; + bool mute() const override = 0; public: // gr::analog::pwr_squelch_ff::sptr @@ -48,17 +48,17 @@ public: */ static sptr make(double db, double alpha = 0.0001, int ramp = 0, bool gate = false); - virtual std::vector<float> squelch_range() const = 0; + std::vector<float> squelch_range() const override = 0; virtual double threshold() const = 0; virtual void set_threshold(double db) = 0; virtual void set_alpha(double alpha) = 0; - virtual int ramp() const = 0; - virtual void set_ramp(int ramp) = 0; - virtual bool gate() const = 0; - virtual void set_gate(bool gate) = 0; - virtual bool unmuted() const = 0; + int ramp() const override = 0; + void set_ramp(int ramp) override = 0; + bool gate() const override = 0; + void set_gate(bool gate) override = 0; + bool unmuted() const override = 0; }; } /* namespace analog */ diff --git a/gr-analog/lib/agc2_cc_impl.h b/gr-analog/lib/agc2_cc_impl.h index 71c3c8f02e..c4e34caa70 100644 --- a/gr-analog/lib/agc2_cc_impl.h +++ b/gr-analog/lib/agc2_cc_impl.h @@ -23,19 +23,25 @@ public: float decay_rate = 1e-2, float reference = 1.0, float gain = 1.0); - ~agc2_cc_impl(); - - float attack_rate() const { return kernel::agc2_cc::attack_rate(); } - float decay_rate() const { return kernel::agc2_cc::decay_rate(); } - float reference() const { return kernel::agc2_cc::reference(); } - float gain() const { return kernel::agc2_cc::gain(); } - float max_gain() const { return kernel::agc2_cc::max_gain(); } - - void set_attack_rate(float rate) { kernel::agc2_cc::set_attack_rate(rate); } - void set_decay_rate(float rate) { kernel::agc2_cc::set_decay_rate(rate); } - void set_reference(float reference) { kernel::agc2_cc::set_reference(reference); } - void set_gain(float gain) { kernel::agc2_cc::set_gain(gain); } - void set_max_gain(float max_gain) { kernel::agc2_cc::set_max_gain(max_gain); } + ~agc2_cc_impl() override; + + float attack_rate() const override { return kernel::agc2_cc::attack_rate(); } + float decay_rate() const override { return kernel::agc2_cc::decay_rate(); } + float reference() const override { return kernel::agc2_cc::reference(); } + float gain() const override { return kernel::agc2_cc::gain(); } + float max_gain() const override { return kernel::agc2_cc::max_gain(); } + + void set_attack_rate(float rate) override { kernel::agc2_cc::set_attack_rate(rate); } + void set_decay_rate(float rate) override { kernel::agc2_cc::set_decay_rate(rate); } + void set_reference(float reference) override + { + kernel::agc2_cc::set_reference(reference); + } + void set_gain(float gain) override { kernel::agc2_cc::set_gain(gain); } + void set_max_gain(float max_gain) override + { + kernel::agc2_cc::set_max_gain(max_gain); + } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/agc2_ff_impl.h b/gr-analog/lib/agc2_ff_impl.h index 7ea2a3ad70..482b30a97b 100644 --- a/gr-analog/lib/agc2_ff_impl.h +++ b/gr-analog/lib/agc2_ff_impl.h @@ -23,19 +23,25 @@ public: float decay_rate = 1e-2, float reference = 1.0, float gain = 1.0); - ~agc2_ff_impl(); - - float attack_rate() const { return kernel::agc2_ff::attack_rate(); } - float decay_rate() const { return kernel::agc2_ff::decay_rate(); } - float reference() const { return kernel::agc2_ff::reference(); } - float gain() const { return kernel::agc2_ff::gain(); } - float max_gain() const { return kernel::agc2_ff::max_gain(); } - - void set_attack_rate(float rate) { kernel::agc2_ff::set_attack_rate(rate); } - void set_decay_rate(float rate) { kernel::agc2_ff::set_decay_rate(rate); } - void set_reference(float reference) { kernel::agc2_ff::set_reference(reference); } - void set_gain(float gain) { kernel::agc2_ff::set_gain(gain); } - void set_max_gain(float max_gain) { kernel::agc2_ff::set_max_gain(max_gain); } + ~agc2_ff_impl() override; + + float attack_rate() const override { return kernel::agc2_ff::attack_rate(); } + float decay_rate() const override { return kernel::agc2_ff::decay_rate(); } + float reference() const override { return kernel::agc2_ff::reference(); } + float gain() const override { return kernel::agc2_ff::gain(); } + float max_gain() const override { return kernel::agc2_ff::max_gain(); } + + void set_attack_rate(float rate) override { kernel::agc2_ff::set_attack_rate(rate); } + void set_decay_rate(float rate) override { kernel::agc2_ff::set_decay_rate(rate); } + void set_reference(float reference) override + { + kernel::agc2_ff::set_reference(reference); + } + void set_gain(float gain) override { kernel::agc2_ff::set_gain(gain); } + void set_max_gain(float max_gain) override + { + kernel::agc2_ff::set_max_gain(max_gain); + } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/agc3_cc_impl.h b/gr-analog/lib/agc3_cc_impl.h index b9cd6cb8ff..350edeb867 100644 --- a/gr-analog/lib/agc3_cc_impl.h +++ b/gr-analog/lib/agc3_cc_impl.h @@ -24,19 +24,19 @@ public: float reference = 1.0, float gain = 1.0, int iir_update_decim = 1); - ~agc3_cc_impl(); - - float attack_rate() const { return d_attack; } - float decay_rate() const { return d_decay; } - float reference() const { return d_reference; } - float gain() const { return d_gain; } - float max_gain() const { return d_max_gain; } - - void set_attack_rate(float rate) { d_attack = rate; } - void set_decay_rate(float rate) { d_decay = rate; } - void set_reference(float reference) { d_reference = reference; } - void set_gain(float gain) { d_gain = gain; } - void set_max_gain(float max_gain) { d_max_gain = max_gain; } + ~agc3_cc_impl() override; + + float attack_rate() const override { return d_attack; } + float decay_rate() const override { return d_decay; } + float reference() const override { return d_reference; } + float gain() const override { return d_gain; } + float max_gain() const override { return d_max_gain; } + + void set_attack_rate(float rate) override { d_attack = rate; } + void set_decay_rate(float rate) override { d_decay = rate; } + void set_reference(float reference) override { d_reference = reference; } + void set_gain(float gain) override { d_gain = gain; } + void set_max_gain(float max_gain) override { d_max_gain = max_gain; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/agc_cc_impl.h b/gr-analog/lib/agc_cc_impl.h index ae090ed241..10a3c2c3f1 100644 --- a/gr-analog/lib/agc_cc_impl.h +++ b/gr-analog/lib/agc_cc_impl.h @@ -20,17 +20,20 @@ class agc_cc_impl : public agc_cc, kernel::agc_cc { public: agc_cc_impl(float rate = 1e-4, float reference = 1.0, float gain = 1.0); - ~agc_cc_impl(); - - float rate() const { return kernel::agc_cc::rate(); } - float reference() const { return kernel::agc_cc::reference(); } - float gain() const { return kernel::agc_cc::gain(); } - float max_gain() const { return kernel::agc_cc::max_gain(); } - - void set_rate(float rate) { kernel::agc_cc::set_rate(rate); } - void set_reference(float reference) { kernel::agc_cc::set_reference(reference); } - void set_gain(float gain) { kernel::agc_cc::set_gain(gain); } - void set_max_gain(float max_gain) { kernel::agc_cc::set_max_gain(max_gain); } + ~agc_cc_impl() override; + + float rate() const override { return kernel::agc_cc::rate(); } + float reference() const override { return kernel::agc_cc::reference(); } + float gain() const override { return kernel::agc_cc::gain(); } + float max_gain() const override { return kernel::agc_cc::max_gain(); } + + void set_rate(float rate) override { kernel::agc_cc::set_rate(rate); } + void set_reference(float reference) override + { + kernel::agc_cc::set_reference(reference); + } + void set_gain(float gain) override { kernel::agc_cc::set_gain(gain); } + void set_max_gain(float max_gain) override { kernel::agc_cc::set_max_gain(max_gain); } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/agc_ff_impl.h b/gr-analog/lib/agc_ff_impl.h index befdb16956..7e9e76ee92 100644 --- a/gr-analog/lib/agc_ff_impl.h +++ b/gr-analog/lib/agc_ff_impl.h @@ -20,17 +20,20 @@ class agc_ff_impl : public agc_ff, kernel::agc_ff { public: agc_ff_impl(float rate = 1e-4, float reference = 1.0, float gain = 1.0); - ~agc_ff_impl(); - - float rate() const { return kernel::agc_ff::rate(); } - float reference() const { return kernel::agc_ff::reference(); } - float gain() const { return kernel::agc_ff::gain(); } - float max_gain() const { return kernel::agc_ff::max_gain(); } - - void set_rate(float rate) { kernel::agc_ff::set_rate(rate); } - void set_reference(float reference) { kernel::agc_ff::set_reference(reference); } - void set_gain(float gain) { kernel::agc_ff::set_gain(gain); } - void set_max_gain(float max_gain) { kernel::agc_ff::set_max_gain(max_gain); } + ~agc_ff_impl() override; + + float rate() const override { return kernel::agc_ff::rate(); } + float reference() const override { return kernel::agc_ff::reference(); } + float gain() const override { return kernel::agc_ff::gain(); } + float max_gain() const override { return kernel::agc_ff::max_gain(); } + + void set_rate(float rate) override { kernel::agc_ff::set_rate(rate); } + void set_reference(float reference) override + { + kernel::agc_ff::set_reference(reference); + } + void set_gain(float gain) override { kernel::agc_ff::set_gain(gain); } + void set_max_gain(float max_gain) override { kernel::agc_ff::set_max_gain(max_gain); } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/cpfsk_bc_impl.h b/gr-analog/lib/cpfsk_bc_impl.h index a8392da248..3506530ee6 100644 --- a/gr-analog/lib/cpfsk_bc_impl.h +++ b/gr-analog/lib/cpfsk_bc_impl.h @@ -24,12 +24,12 @@ private: public: cpfsk_bc_impl(float k, float ampl, int samples_per_sym); - ~cpfsk_bc_impl(); + ~cpfsk_bc_impl() override; - void set_amplitude(float amplitude) { d_ampl = amplitude; } - float amplitude() { return d_ampl; } - float freq() { return d_freq; } - float phase() { return d_phase; } + void set_amplitude(float amplitude) override { d_ampl = amplitude; } + float amplitude() override { return d_ampl; } + float freq() override { return d_freq; } + float phase() override { return d_phase; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.h b/gr-analog/lib/ctcss_squelch_ff_impl.h index 1a135e802f..06f2fa2f29 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.h +++ b/gr-analog/lib/ctcss_squelch_ff_impl.h @@ -38,26 +38,26 @@ private: void update_fft_params(); protected: - virtual void update_state(const float& in); - virtual bool mute() const { return d_mute; } + void update_state(const float& in) override; + bool mute() const override { return d_mute; } public: ctcss_squelch_ff_impl( int rate, float freq, float level, int len, int ramp, bool gate); - ~ctcss_squelch_ff_impl(); + ~ctcss_squelch_ff_impl() override; - std::vector<float> squelch_range() const; - float level() const { return d_level; } - void set_level(float level); - int len() const { return d_len; } - float frequency() const { return d_freq; } - void set_frequency(float frequency); + std::vector<float> squelch_range() const override; + float level() const override { return d_level; } + void set_level(float level) override; + int len() const override { return d_len; } + float frequency() const override { return d_freq; } + void set_frequency(float frequency) override; - int ramp() const { return squelch_base_ff_impl::ramp(); } - void set_ramp(int ramp) { squelch_base_ff_impl::set_ramp(ramp); } - bool gate() const { return squelch_base_ff_impl::gate(); } - void set_gate(bool gate) { squelch_base_ff_impl::set_gate(gate); } - bool unmuted() const { return squelch_base_ff_impl::unmuted(); } + int ramp() const override { return squelch_base_ff_impl::ramp(); } + void set_ramp(int ramp) override { squelch_base_ff_impl::set_ramp(ramp); } + bool gate() const override { return squelch_base_ff_impl::gate(); } + void set_gate(bool gate) override { squelch_base_ff_impl::set_gate(gate); } + bool unmuted() const override { return squelch_base_ff_impl::unmuted(); } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-analog/lib/dpll_bb_impl.h b/gr-analog/lib/dpll_bb_impl.h index 96c89459f4..65ec6f47ac 100644 --- a/gr-analog/lib/dpll_bb_impl.h +++ b/gr-analog/lib/dpll_bb_impl.h @@ -25,15 +25,15 @@ private: public: dpll_bb_impl(float period, float gain); - ~dpll_bb_impl(); + ~dpll_bb_impl() override; - void set_gain(float gain) { d_gain = gain; } - void set_decision_threshold(float thresh) { d_decision_threshold = thresh; } + void set_gain(float gain) override { d_gain = gain; } + void set_decision_threshold(float thresh) override { d_decision_threshold = thresh; } - float gain() const { return d_gain; } - float freq() const { return d_pulse_frequency; } - float phase() const { return d_pulse_phase; } - float decision_threshold() const { return d_decision_threshold; } + float gain() const override { return d_gain; } + float freq() const override { return d_pulse_frequency; } + float phase() const override { return d_pulse_phase; } + float decision_threshold() const override { return d_decision_threshold; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/fastnoise_source_impl.h b/gr-analog/lib/fastnoise_source_impl.h index e2550afadf..872f41e4b1 100644 --- a/gr-analog/lib/fastnoise_source_impl.h +++ b/gr-analog/lib/fastnoise_source_impl.h @@ -31,18 +31,18 @@ private: public: fastnoise_source_impl(noise_type_t type, float ampl, long seed, long samples); - ~fastnoise_source_impl(); + ~fastnoise_source_impl() override; - T sample(); - T sample_unbiased(); - const std::vector<T>& samples() const; + T sample() override; + T sample_unbiased() override; + const std::vector<T>& samples() const override; - void set_type(noise_type_t type); - void set_amplitude(float ampl); + void set_type(noise_type_t type) override; + void set_amplitude(float ampl) override; void generate(); - noise_type_t type() const { return d_type; } - float amplitude() const { return d_ampl; } + noise_type_t type() const override { return d_type; } + float amplitude() const override { return d_ampl; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/feedforward_agc_cc_impl.h b/gr-analog/lib/feedforward_agc_cc_impl.h index d1f1726022..811aa27076 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.h +++ b/gr-analog/lib/feedforward_agc_cc_impl.h @@ -24,7 +24,7 @@ private: public: feedforward_agc_cc_impl(int nsamples, float reference); - ~feedforward_agc_cc_impl(); + ~feedforward_agc_cc_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/fmdet_cf_impl.h b/gr-analog/lib/fmdet_cf_impl.h index 6350c61943..15d6644966 100644 --- a/gr-analog/lib/fmdet_cf_impl.h +++ b/gr-analog/lib/fmdet_cf_impl.h @@ -27,16 +27,16 @@ private: public: fmdet_cf_impl(float samplerate, float freq_low, float freq_high, float scl); - ~fmdet_cf_impl(); + ~fmdet_cf_impl() override; - void set_scale(float scl); - void set_freq_range(float freq_low, float freq_high); + void set_scale(float scl) override; + void set_freq_range(float freq_low, float freq_high) override; - float freq() const { return d_freq; } - float freq_high() const { return d_freqhi; } - float freq_low() const { return d_freqlo; } - float scale() const { return d_scl; } - float bias() const { return d_bias; } + float freq() const override { return d_freq; } + float freq_high() const override { return d_freqhi; } + float freq_low() const override { return d_freqlo; } + float scale() const override { return d_scl; } + float bias() const override { return d_bias; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/frequency_modulator_fc_impl.h b/gr-analog/lib/frequency_modulator_fc_impl.h index 0cd3a007dd..1ccf11454a 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.h +++ b/gr-analog/lib/frequency_modulator_fc_impl.h @@ -24,12 +24,12 @@ private: public: frequency_modulator_fc_impl(float sensitivity); - ~frequency_modulator_fc_impl(); + ~frequency_modulator_fc_impl() override; - void set_sensitivity(float sens) { d_sensitivity = sens; } - float sensitivity() const { return d_sensitivity; } + void set_sensitivity(float sens) override { d_sensitivity = sens; } + float sensitivity() const override { return d_sensitivity; } - void setup_rpc(); + void setup_rpc() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/noise_source_impl.h b/gr-analog/lib/noise_source_impl.h index 59a14d3adc..135022785b 100644 --- a/gr-analog/lib/noise_source_impl.h +++ b/gr-analog/lib/noise_source_impl.h @@ -27,13 +27,13 @@ class noise_source_impl : public noise_source<T> public: noise_source_impl(noise_type_t type, float ampl, long seed = 0); - ~noise_source_impl(); + ~noise_source_impl() override; - void set_type(noise_type_t type); - void set_amplitude(float ampl); + void set_type(noise_type_t type) override; + void set_amplitude(float ampl) override; - noise_type_t type() const { return d_type; } - float amplitude() const { return d_ampl; } + noise_type_t type() const override { return d_type; } + float amplitude() const override { return d_ampl; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/phase_modulator_fc_impl.h b/gr-analog/lib/phase_modulator_fc_impl.h index 2c4ef279fc..4e81331513 100644 --- a/gr-analog/lib/phase_modulator_fc_impl.h +++ b/gr-analog/lib/phase_modulator_fc_impl.h @@ -24,13 +24,13 @@ private: public: phase_modulator_fc_impl(double sensitivity); - ~phase_modulator_fc_impl(); + ~phase_modulator_fc_impl() override; - double sensitivity() const { return d_sensitivity; } - double phase() const { return d_phase; } + double sensitivity() const override { return d_sensitivity; } + double phase() const override { return d_phase; } - void set_sensitivity(double s) { d_sensitivity = s; } - void set_phase(double p) { d_phase = p; } + void set_sensitivity(double s) override { d_sensitivity = s; } + void set_phase(double p) override { d_phase = p; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h index dea1aa4264..6d499f37f6 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.h +++ b/gr-analog/lib/pll_carriertracking_cc_impl.h @@ -43,30 +43,30 @@ private: public: pll_carriertracking_cc_impl(float loop_bw, float max_freq, float min_freq); - ~pll_carriertracking_cc_impl(); + ~pll_carriertracking_cc_impl() override; - bool lock_detector(void) { return (fabsf(d_locksig) > d_lock_threshold); } + bool lock_detector(void) override { return (fabsf(d_locksig) > d_lock_threshold); } - bool squelch_enable(bool); - float set_lock_threshold(float); + bool squelch_enable(bool) override; + float set_lock_threshold(float) 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_frequency(float freq); - void set_phase(float phase); - void set_min_freq(float freq); - void set_max_freq(float freq); + 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_frequency(float freq) override; + void set_phase(float phase) override; + void set_min_freq(float freq) override; + void set_max_freq(float freq) override; - float get_loop_bandwidth() const; - float get_damping_factor() const; - float get_alpha() const; - float get_beta() const; - float get_frequency() const; - float get_phase() const; - float get_min_freq() const; - float get_max_freq() const; + float get_loop_bandwidth() const override; + float get_damping_factor() const override; + float get_alpha() const override; + float get_beta() const override; + float get_frequency() const override; + float get_phase() const override; + float get_min_freq() const override; + float get_max_freq() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h index 34376bdd20..53af570ed7 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.h +++ b/gr-analog/lib/pll_freqdet_cf_impl.h @@ -40,25 +40,25 @@ private: public: pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq); - ~pll_freqdet_cf_impl(); + ~pll_freqdet_cf_impl() 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_frequency(float freq); - void set_phase(float phase); - void set_min_freq(float freq); - void set_max_freq(float freq); + 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_frequency(float freq) override; + void set_phase(float phase) override; + void set_min_freq(float freq) override; + void set_max_freq(float freq) override; - float get_loop_bandwidth() const; - float get_damping_factor() const; - float get_alpha() const; - float get_beta() const; - float get_frequency() const; - float get_phase() const; - float get_min_freq() const; - float get_max_freq() const; + float get_loop_bandwidth() const override; + float get_damping_factor() const override; + float get_alpha() const override; + float get_beta() const override; + float get_frequency() const override; + float get_phase() const override; + float get_min_freq() const override; + float get_max_freq() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h index 364e5cd515..87348bfb48 100644 --- a/gr-analog/lib/pll_refout_cc_impl.h +++ b/gr-analog/lib/pll_refout_cc_impl.h @@ -40,9 +40,9 @@ private: public: pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq); - ~pll_refout_cc_impl(); + ~pll_refout_cc_impl() override; - void set_loop_bandwidth(float bw); + void set_loop_bandwidth(float bw) override; void set_damping_factor(float df); void set_alpha(float alpha); void set_beta(float beta); diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h index 9c99a80635..1baf0302e5 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h @@ -27,16 +27,16 @@ private: public: probe_avg_mag_sqrd_c_impl(double threshold_db, double alpha = 0.0001); - ~probe_avg_mag_sqrd_c_impl(); + ~probe_avg_mag_sqrd_c_impl() override; - bool unmuted() const { return d_unmuted; } - double level() const { return d_level; } + bool unmuted() const override { return d_unmuted; } + double level() const override { return d_level; } - double threshold() const; + double threshold() const override; - void set_alpha(double alpha); - void set_threshold(double decibels); - void reset(); + void set_alpha(double alpha) override; + void set_threshold(double decibels) override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h index 77861ebc6e..22e2e641ad 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h @@ -27,16 +27,16 @@ private: public: probe_avg_mag_sqrd_cf_impl(double threshold_db, double alpha); - ~probe_avg_mag_sqrd_cf_impl(); + ~probe_avg_mag_sqrd_cf_impl() override; - bool unmuted() const { return d_unmuted; } - double level() const { return d_level; } + bool unmuted() const override { return d_unmuted; } + double level() const override { return d_level; } - double threshold() const; + double threshold() const override; - void set_alpha(double alpha); - void set_threshold(double decibels); - void reset(); + void set_alpha(double alpha) override; + void set_threshold(double decibels) override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h index 97c65ee44e..3844af3a50 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h @@ -27,16 +27,16 @@ private: public: probe_avg_mag_sqrd_f_impl(double threshold_db, double alpha); - ~probe_avg_mag_sqrd_f_impl(); + ~probe_avg_mag_sqrd_f_impl() override; - bool unmuted() const { return d_unmuted; } - double level() const { return d_level; } + bool unmuted() const override { return d_unmuted; } + double level() const override { return d_level; } - double threshold() const; + double threshold() const override; - void set_alpha(double alpha); - void set_threshold(double decibels); - void reset(); + void set_alpha(double alpha) override; + void set_threshold(double decibels) override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/pwr_squelch_cc_impl.h b/gr-analog/lib/pwr_squelch_cc_impl.h index e434bcb1c5..51dd0a1fdc 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.h +++ b/gr-analog/lib/pwr_squelch_cc_impl.h @@ -27,27 +27,27 @@ private: filter::single_pole_iir<double, double, double> d_iir; protected: - virtual void update_state(const gr_complex& in); - virtual bool mute() const { return d_pwr < d_threshold; } + void update_state(const gr_complex& in) override; + bool mute() const override { return d_pwr < d_threshold; } public: pwr_squelch_cc_impl(double db, double alpha = 0.0001, int ramp = 0, bool gate = false); - ~pwr_squelch_cc_impl(); + ~pwr_squelch_cc_impl() override; - std::vector<float> squelch_range() const; + std::vector<float> squelch_range() const override; - double threshold() const { return 10 * log10(d_threshold); } - void set_threshold(double db); - void set_alpha(double alpha); + double threshold() const override { return 10 * log10(d_threshold); } + void set_threshold(double db) override; + void set_alpha(double alpha) override; - int ramp() const { return squelch_base_cc_impl::ramp(); } - void set_ramp(int ramp) { squelch_base_cc_impl::set_ramp(ramp); } - bool gate() const { return squelch_base_cc_impl::gate(); } - void set_gate(bool gate) { squelch_base_cc_impl::set_gate(gate); } - bool unmuted() const { return squelch_base_cc_impl::unmuted(); } + int ramp() const override { return squelch_base_cc_impl::ramp(); } + void set_ramp(int ramp) override { squelch_base_cc_impl::set_ramp(ramp); } + bool gate() const override { return squelch_base_cc_impl::gate(); } + void set_gate(bool gate) override { squelch_base_cc_impl::set_gate(gate); } + bool unmuted() const override { return squelch_base_cc_impl::unmuted(); } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-analog/lib/pwr_squelch_ff_impl.h b/gr-analog/lib/pwr_squelch_ff_impl.h index 2bc4b86373..cb13cb538b 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.h +++ b/gr-analog/lib/pwr_squelch_ff_impl.h @@ -27,27 +27,27 @@ private: filter::single_pole_iir<double, double, double> d_iir; protected: - virtual void update_state(const float& in); - virtual bool mute() const { return d_pwr < d_threshold; } + void update_state(const float& in) override; + bool mute() const override { return d_pwr < d_threshold; } public: pwr_squelch_ff_impl(double db, double alpha = 0.0001, int ramp = 0, bool gate = false); - ~pwr_squelch_ff_impl(); + ~pwr_squelch_ff_impl() override; - std::vector<float> squelch_range() const; + std::vector<float> squelch_range() const override; - double threshold() const { return 10 * log10(d_threshold); } - void set_threshold(double db) { d_threshold = std::pow(10.0, db / 10); } - void set_alpha(double alpha) { d_iir.set_taps(alpha); } + double threshold() const override { return 10 * log10(d_threshold); } + void set_threshold(double db) override { d_threshold = std::pow(10.0, db / 10); } + void set_alpha(double alpha) override { d_iir.set_taps(alpha); } - int ramp() const { return squelch_base_ff_impl::ramp(); } - void set_ramp(int ramp) { squelch_base_ff_impl::set_ramp(ramp); } - bool gate() const { return squelch_base_ff_impl::gate(); } - void set_gate(bool gate) { squelch_base_ff_impl::set_gate(gate); } - bool unmuted() const { return squelch_base_ff_impl::unmuted(); } + int ramp() const override { return squelch_base_ff_impl::ramp(); } + void set_ramp(int ramp) override { squelch_base_ff_impl::set_ramp(ramp); } + bool gate() const override { return squelch_base_ff_impl::gate(); } + void set_gate(bool gate) override { squelch_base_ff_impl::set_gate(gate); } + bool unmuted() const override { return squelch_base_ff_impl::unmuted(); } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-analog/lib/quadrature_demod_cf_impl.h b/gr-analog/lib/quadrature_demod_cf_impl.h index 6b6082b595..7a56da3825 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.h +++ b/gr-analog/lib/quadrature_demod_cf_impl.h @@ -23,10 +23,10 @@ private: public: quadrature_demod_cf_impl(float gain); - ~quadrature_demod_cf_impl(); + ~quadrature_demod_cf_impl() override; - void set_gain(float gain) { d_gain = gain; } - float gain() const { return d_gain; } + void set_gain(float gain) override { d_gain = gain; } + float gain() const override { return d_gain; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/rail_ff_impl.h b/gr-analog/lib/rail_ff_impl.h index 4717686a32..96703ed558 100644 --- a/gr-analog/lib/rail_ff_impl.h +++ b/gr-analog/lib/rail_ff_impl.h @@ -26,13 +26,13 @@ private: public: rail_ff_impl(float lo, float hi); - ~rail_ff_impl(); + ~rail_ff_impl() override; - float lo() const { return d_lo; } - float hi() const { return d_hi; } + float lo() const override { return d_lo; } + float hi() const override { return d_hi; } - void set_lo(float lo); - void set_hi(float hi); + void set_lo(float lo) override; + void set_hi(float hi) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/random_uniform_source_impl.h b/gr-analog/lib/random_uniform_source_impl.h index 8e583618b6..5b0b02898b 100644 --- a/gr-analog/lib/random_uniform_source_impl.h +++ b/gr-analog/lib/random_uniform_source_impl.h @@ -26,7 +26,7 @@ private: public: random_uniform_source_impl(int minimum, int maximum, int seed); - ~random_uniform_source_impl(); + ~random_uniform_source_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-analog/lib/sig_source_impl.h b/gr-analog/lib/sig_source_impl.h index 580643c4ee..d73c51de68 100644 --- a/gr-analog/lib/sig_source_impl.h +++ b/gr-analog/lib/sig_source_impl.h @@ -37,31 +37,31 @@ public: double ampl, T offset = 0, float phase = 0); - ~sig_source_impl(); + ~sig_source_impl() override; - virtual int work(int noutput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) override; + int work(int noutput_items, + gr_vector_const_void_star& input_items, + gr_vector_void_star& output_items) override; - double sampling_freq() const { return d_sampling_freq; } - gr_waveform_t waveform() const { return d_waveform; } - double frequency() const { return d_frequency; } - double amplitude() const { return d_ampl; } - T offset() const { return d_offset; } - float phase() const { return d_nco.get_phase(); } + double sampling_freq() const override { return d_sampling_freq; } + gr_waveform_t waveform() const override { return d_waveform; } + double frequency() const override { return d_frequency; } + double amplitude() const override { return d_ampl; } + T offset() const override { return d_offset; } + float phase() const override { return d_nco.get_phase(); } - void set_sampling_freq(double sampling_freq); - void set_waveform(gr_waveform_t waveform); + void set_sampling_freq(double sampling_freq) override; + void set_waveform(gr_waveform_t waveform) override; // Message handlers //!\brief deprecated handler. Use "cmd" port instead. void set_freq_msg(pmt::pmt_t msg); void set_cmd_msg(pmt::pmt_t msg); - void set_frequency(double frequency); - void set_amplitude(double ampl); - void set_offset(T offset); - void set_phase(float phase); + void set_frequency(double frequency) override; + void set_amplitude(double ampl) override; + void set_offset(T offset) override; + void set_phase(float phase) override; }; } /* namespace analog */ diff --git a/gr-analog/lib/simple_squelch_cc_impl.h b/gr-analog/lib/simple_squelch_cc_impl.h index b680701e33..6764797b4b 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.h +++ b/gr-analog/lib/simple_squelch_cc_impl.h @@ -26,15 +26,15 @@ private: public: simple_squelch_cc_impl(double threshold_db, double alpha); - ~simple_squelch_cc_impl(); + ~simple_squelch_cc_impl() override; - bool unmuted() const { return d_unmuted; } + bool unmuted() const override { return d_unmuted; } - void set_alpha(double alpha); - void set_threshold(double decibels); + void set_alpha(double alpha) override; + void set_threshold(double decibels) override; - double threshold() const; - std::vector<float> squelch_range() const; + double threshold() const override; + std::vector<float> squelch_range() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-analog/lib/squelch_base_cc_impl.h b/gr-analog/lib/squelch_base_cc_impl.h index 1608cb451c..01410daa44 100644 --- a/gr-analog/lib/squelch_base_cc_impl.h +++ b/gr-analog/lib/squelch_base_cc_impl.h @@ -28,20 +28,20 @@ private: bool d_tag_next_unmuted; protected: - virtual void update_state(const gr_complex& sample){}; - virtual bool mute() const { return false; }; + void update_state(const gr_complex& sample) override{}; + bool mute() const override { return false; }; public: squelch_base_cc_impl(const char* name, int ramp, bool gate); - ~squelch_base_cc_impl(); + ~squelch_base_cc_impl() override; - int ramp() const; - void set_ramp(int ramp); - bool gate() const; - void set_gate(bool gate); - bool unmuted() const; + int ramp() const override; + void set_ramp(int ramp) override; + bool gate() const override; + void set_gate(bool gate) override; + bool unmuted() const override; - virtual std::vector<float> squelch_range() const = 0; + std::vector<float> squelch_range() const override = 0; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-analog/lib/squelch_base_ff_impl.h b/gr-analog/lib/squelch_base_ff_impl.h index 3d239ac2fd..3e9128d152 100644 --- a/gr-analog/lib/squelch_base_ff_impl.h +++ b/gr-analog/lib/squelch_base_ff_impl.h @@ -29,20 +29,20 @@ private: bool d_tag_next_unmuted; protected: - virtual void update_state(const float& sample){}; - virtual bool mute() const { return false; }; + void update_state(const float& sample) override{}; + bool mute() const override { return false; }; public: squelch_base_ff_impl(const char* name, int ramp, bool gate); - ~squelch_base_ff_impl(); + ~squelch_base_ff_impl() override; - int ramp() const; - void set_ramp(int ramp); - bool gate() const; - void set_gate(bool gate); - bool unmuted() const; + int ramp() const override; + void set_ramp(int ramp) override; + bool gate() const override; + void set_gate(bool gate) override; + bool unmuted() const override; - virtual std::vector<float> squelch_range() const = 0; + std::vector<float> squelch_range() const override = 0; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-analog/python/analog/bindings/ctcss_squelch_ff_python.cc b/gr-analog/python/analog/bindings/ctcss_squelch_ff_python.cc index 53aab7c447..b61ca6b2f4 100644 --- a/gr-analog/python/analog/bindings/ctcss_squelch_ff_python.cc +++ b/gr-analog/python/analog/bindings/ctcss_squelch_ff_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(ctcss_squelch_ff.h) */ -/* BINDTOOL_HEADER_FILE_HASH(e3921bc97f0f8813b708306467a41d49) */ +/* BINDTOOL_HEADER_FILE_HASH(eb02d854023b3cdc76f26dc5e99f5c6e) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-analog/python/analog/bindings/pll_carriertracking_cc_python.cc b/gr-analog/python/analog/bindings/pll_carriertracking_cc_python.cc index 559a2d61cb..03a07fbc0f 100644 --- a/gr-analog/python/analog/bindings/pll_carriertracking_cc_python.cc +++ b/gr-analog/python/analog/bindings/pll_carriertracking_cc_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pll_carriertracking_cc.h) */ -/* BINDTOOL_HEADER_FILE_HASH(6a2575e904642d50edec70e0439649ed) */ +/* BINDTOOL_HEADER_FILE_HASH(578b0d642e583a358c5866cb1b663756) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-analog/python/analog/bindings/pll_freqdet_cf_python.cc b/gr-analog/python/analog/bindings/pll_freqdet_cf_python.cc index dd313bb26d..1a25db3eb9 100644 --- a/gr-analog/python/analog/bindings/pll_freqdet_cf_python.cc +++ b/gr-analog/python/analog/bindings/pll_freqdet_cf_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pll_freqdet_cf.h) */ -/* BINDTOOL_HEADER_FILE_HASH(7960ba805d99b0ab39271abf8b583d97) */ +/* BINDTOOL_HEADER_FILE_HASH(aac775a72088e302d8d52ba5367e36b2) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-analog/python/analog/bindings/pwr_squelch_cc_python.cc b/gr-analog/python/analog/bindings/pwr_squelch_cc_python.cc index 6ed96bfd76..e55c7b45c5 100644 --- a/gr-analog/python/analog/bindings/pwr_squelch_cc_python.cc +++ b/gr-analog/python/analog/bindings/pwr_squelch_cc_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pwr_squelch_cc.h) */ -/* BINDTOOL_HEADER_FILE_HASH(9a039b4f53e3fc5fce917d466fb459c8) */ +/* BINDTOOL_HEADER_FILE_HASH(4a3eecaaf775434834d615f1a58d5f9e) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-analog/python/analog/bindings/pwr_squelch_ff_python.cc b/gr-analog/python/analog/bindings/pwr_squelch_ff_python.cc index c6dabb9f07..99dea87965 100644 --- a/gr-analog/python/analog/bindings/pwr_squelch_ff_python.cc +++ b/gr-analog/python/analog/bindings/pwr_squelch_ff_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pwr_squelch_ff.h) */ -/* BINDTOOL_HEADER_FILE_HASH(e1c00792c96ef3531cb83bd242fc382d) */ +/* BINDTOOL_HEADER_FILE_HASH(e1ff64fcbc54b37e480c87c78a898df0) */ /***********************************************************************************/ #include <pybind11/complex.h> |