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-channels/lib/dynamic_channel_model_impl.h | |
parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-channels/lib/dynamic_channel_model_impl.h')
-rw-r--r-- | gr-channels/lib/dynamic_channel_model_impl.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gr-channels/lib/dynamic_channel_model_impl.h b/gr-channels/lib/dynamic_channel_model_impl.h index d8ea8f0efa..5b73beb8de 100644 --- a/gr-channels/lib/dynamic_channel_model_impl.h +++ b/gr-channels/lib/dynamic_channel_model_impl.h @@ -51,32 +51,32 @@ public: double noise_amp, double noise_seed); - ~dynamic_channel_model_impl(); + ~dynamic_channel_model_impl() override; - void setup_rpc(); + void setup_rpc() override; - double samp_rate() const { return d_sro_model->samp_rate(); } - double sro_dev_std() const { return d_sro_model->std_dev(); } - double sro_dev_max() const { return d_sro_model->max_dev(); } - double cfo_dev_std() const { return d_cfo_model->std_dev(); } - double cfo_dev_max() const { return d_cfo_model->max_dev(); } - double noise_amp() const { return d_noise->amplitude(); } - double doppler_freq() const { return d_fader->fDTs() * samp_rate(); } - double K() const { return d_fader->K(); } + double samp_rate() const override { return d_sro_model->samp_rate(); } + double sro_dev_std() const override { return d_sro_model->std_dev(); } + double sro_dev_max() const override { return d_sro_model->max_dev(); } + double cfo_dev_std() const override { return d_cfo_model->std_dev(); } + double cfo_dev_max() const override { return d_cfo_model->max_dev(); } + double noise_amp() const override { return d_noise->amplitude(); } + double doppler_freq() const override { return d_fader->fDTs() * samp_rate(); } + double K() const override { return d_fader->K(); } - void set_samp_rate(double sr) + void set_samp_rate(double sr) override { d_fader->set_fDTs(doppler_freq() / samp_rate()); d_sro_model->set_samp_rate(sr); d_cfo_model->set_samp_rate(sr); } - void set_sro_dev_std(double dev) { d_sro_model->set_max_dev(dev); } - void set_sro_dev_max(double dev) { d_sro_model->set_max_dev(dev); } - void set_cfo_dev_std(double dev) { d_cfo_model->set_std_dev(dev); } - void set_cfo_dev_max(double dev) { d_cfo_model->set_max_dev(dev); } - void set_noise_amp(double amp) { d_noise->set_amplitude(amp); } - void set_doppler_freq(double f) { d_fader->set_fDTs(f / samp_rate()); } - void set_K(double K) { d_fader->set_K(K); } + void set_sro_dev_std(double dev) override { d_sro_model->set_max_dev(dev); } + void set_sro_dev_max(double dev) override { d_sro_model->set_max_dev(dev); } + void set_cfo_dev_std(double dev) override { d_cfo_model->set_std_dev(dev); } + void set_cfo_dev_max(double dev) override { d_cfo_model->set_max_dev(dev); } + void set_noise_amp(double amp) override { d_noise->set_amplitude(amp); } + void set_doppler_freq(double f) override { d_fader->set_fDTs(f / samp_rate()); } + void set_K(double K) override { d_fader->set_K(K); } }; } /* namespace channels */ |