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/selective_fading_model2_impl.h | |
| parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) | |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-channels/lib/selective_fading_model2_impl.h')
| -rw-r--r-- | gr-channels/lib/selective_fading_model2_impl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-channels/lib/selective_fading_model2_impl.h b/gr-channels/lib/selective_fading_model2_impl.h index 0538ba1386..83ae7ac972 100644 --- a/gr-channels/lib/selective_fading_model2_impl.h +++ b/gr-channels/lib/selective_fading_model2_impl.h @@ -46,30 +46,30 @@ public: std::vector<float> delays_maxdev, std::vector<float> mags, unsigned int ntaps); - ~selective_fading_model2_impl(); + ~selective_fading_model2_impl() override; // Disallow copy. This is a heavy object. selective_fading_model2_impl(const selective_fading_model2_impl&) = delete; selective_fading_model2_impl& operator=(const selective_fading_model2_impl&) = delete; - void setup_rpc(); + void setup_rpc() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; std::vector<gr_complex> d_taps; - virtual float fDTs() { return d_faders[0].d_fDTs; } - virtual float K() { return d_faders[0].d_K; } - virtual float step() { return d_faders[0].d_step; } + float fDTs() override { return d_faders[0].d_fDTs; } + float K() override { return d_faders[0].d_K; } + float step() override { return d_faders[0].d_step; } - virtual void set_fDTs(float fDTs) + void set_fDTs(float fDTs) override { for (auto& fader : d_faders) { fader.d_fDTs = fDTs; fader.d_step = powf(0.00125 * fDTs, 1.1); } } - virtual void set_K(float K) + void set_K(float K) override { for (auto& fader : d_faders) { fader.d_K = K; @@ -77,7 +77,7 @@ public: fader.scale_nlos = (1 / sqrtf(fader.d_K + 1)); } } - virtual void set_step(float step) + void set_step(float step) override { for (auto& fader : d_faders) { fader.d_step = step; |