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-vocoder/lib | |
parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-vocoder/lib')
-rw-r--r-- | gr-vocoder/lib/alaw_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/alaw_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/codec2_decode_ps_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/codec2_encode_sp_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_decode_bs_impl.h | 18 | ||||
-rw-r--r-- | gr-vocoder/lib/cvsd_encode_sb_impl.h | 18 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_rx_ss_impl.h | 8 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_tx_ss_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g721_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_24_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_24_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_40_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/g723_40_encode_sb_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/gsm_fr_decode_ps_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/gsm_fr_encode_sp_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/ulaw_decode_bs_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/ulaw_encode_sb_impl.h | 2 |
18 files changed, 37 insertions, 37 deletions
diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.h b/gr-vocoder/lib/alaw_decode_bs_impl.h index 546aad41d6..519327931e 100644 --- a/gr-vocoder/lib/alaw_decode_bs_impl.h +++ b/gr-vocoder/lib/alaw_decode_bs_impl.h @@ -20,7 +20,7 @@ class alaw_decode_bs_impl : public alaw_decode_bs { public: alaw_decode_bs_impl(); - ~alaw_decode_bs_impl(); + ~alaw_decode_bs_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.h b/gr-vocoder/lib/alaw_encode_sb_impl.h index 425ef8b217..86b8975685 100644 --- a/gr-vocoder/lib/alaw_encode_sb_impl.h +++ b/gr-vocoder/lib/alaw_encode_sb_impl.h @@ -20,7 +20,7 @@ class alaw_encode_sb_impl : public alaw_encode_sb { public: alaw_encode_sb_impl(); - ~alaw_encode_sb_impl(); + ~alaw_encode_sb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.h b/gr-vocoder/lib/codec2_decode_ps_impl.h index af291b752f..5294bb36e5 100644 --- a/gr-vocoder/lib/codec2_decode_ps_impl.h +++ b/gr-vocoder/lib/codec2_decode_ps_impl.h @@ -29,7 +29,7 @@ private: public: codec2_decode_ps_impl(int mode, int samples_per_frame, int bits_per_frame); - ~codec2_decode_ps_impl(); + ~codec2_decode_ps_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.h b/gr-vocoder/lib/codec2_encode_sp_impl.h index a3e7c87ae8..2e5213e70a 100644 --- a/gr-vocoder/lib/codec2_encode_sp_impl.h +++ b/gr-vocoder/lib/codec2_encode_sp_impl.h @@ -29,7 +29,7 @@ private: public: codec2_encode_sp_impl(int mode, int samples_per_frame, int bits_per_frame); - ~codec2_encode_sp_impl(); + ~codec2_encode_sp_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.h b/gr-vocoder/lib/cvsd_decode_bs_impl.h index 79e39c0acc..cdef3ed2a0 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.h +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.h @@ -61,16 +61,16 @@ public: int J = 4, short pos_accum_max = 32767, short neg_accum_max = -32767); - ~cvsd_decode_bs_impl(); + ~cvsd_decode_bs_impl() override; - short min_step() { return d_min_step; } - short max_step() { return d_max_step; } - double step_decay() { return d_step_decay; } - double accum_decay() { return d_accum_decay; } - int K() { return d_K; } - int J() { return d_J; } - short pos_accum_max() { return d_pos_accum_max; } - short neg_accum_max() { return d_neg_accum_max; } + short min_step() override { return d_min_step; } + short max_step() override { return d_max_step; } + double step_decay() override { return d_step_decay; } + double accum_decay() override { return d_accum_decay; } + int K() override { return d_K; } + int J() override { return d_J; } + short pos_accum_max() override { return d_pos_accum_max; } + short neg_accum_max() override { return d_neg_accum_max; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h index ea6ab4e427..12bc4bb658 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.h +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.h @@ -61,16 +61,16 @@ public: int J = 4, short pos_accum_max = 32767, short neg_accum_max = -32767); - ~cvsd_encode_sb_impl(); + ~cvsd_encode_sb_impl() override; - short min_step() { return d_min_step; } - short max_step() { return d_max_step; } - double step_decay() { return d_step_decay; } - double accum_decay() { return d_accum_decay; } - int K() { return d_K; } - int J() { return d_J; } - short pos_accum_max() { return d_pos_accum_max; } - short neg_accum_max() { return d_neg_accum_max; } + short min_step() override { return d_min_step; } + short max_step() override { return d_max_step; } + double step_decay() override { return d_step_decay; } + double accum_decay() override { return d_accum_decay; } + int K() override { return d_K; } + int J() override { return d_J; } + short pos_accum_max() override { return d_pos_accum_max; } + short neg_accum_max() override { return d_neg_accum_max; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/freedv_rx_ss_impl.h b/gr-vocoder/lib/freedv_rx_ss_impl.h index 71b92ba5c8..6a6c8a55b9 100644 --- a/gr-vocoder/lib/freedv_rx_ss_impl.h +++ b/gr-vocoder/lib/freedv_rx_ss_impl.h @@ -46,11 +46,11 @@ private: public: freedv_rx_ss_impl(int mode, float squelch_thresh, int interleave_frames); - ~freedv_rx_ss_impl(); + ~freedv_rx_ss_impl() override; - void set_squelch_thresh(float squelch_thresh); - float squelch_thresh(); - void set_squelch_en(bool squelch_enabled); + void set_squelch_thresh(float squelch_thresh) override; + float squelch_thresh() override; + void set_squelch_en(bool squelch_enabled) override; // Where all the action really happens void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.h b/gr-vocoder/lib/freedv_tx_ss_impl.h index de999dcb7c..1c4858a709 100644 --- a/gr-vocoder/lib/freedv_tx_ss_impl.h +++ b/gr-vocoder/lib/freedv_tx_ss_impl.h @@ -42,7 +42,7 @@ private: public: freedv_tx_ss_impl(int mode, const std::string txt_msg, int interleave_frames); - ~freedv_tx_ss_impl(); + ~freedv_tx_ss_impl() override; void set_clip(bool val); void set_clip(int val); diff --git a/gr-vocoder/lib/g721_decode_bs_impl.h b/gr-vocoder/lib/g721_decode_bs_impl.h index 02f418a454..1de6e5ccce 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.h +++ b/gr-vocoder/lib/g721_decode_bs_impl.h @@ -27,7 +27,7 @@ private: public: g721_decode_bs_impl(); - ~g721_decode_bs_impl(); + ~g721_decode_bs_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/g721_encode_sb_impl.h b/gr-vocoder/lib/g721_encode_sb_impl.h index 98ac0ee9c4..42fe03c035 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.h +++ b/gr-vocoder/lib/g721_encode_sb_impl.h @@ -27,7 +27,7 @@ private: public: g721_encode_sb_impl(); - ~g721_encode_sb_impl(); + ~g721_encode_sb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.h b/gr-vocoder/lib/g723_24_decode_bs_impl.h index 16b88449a9..a690bd0291 100644 --- a/gr-vocoder/lib/g723_24_decode_bs_impl.h +++ b/gr-vocoder/lib/g723_24_decode_bs_impl.h @@ -27,7 +27,7 @@ private: public: g723_24_decode_bs_impl(); - ~g723_24_decode_bs_impl(); + ~g723_24_decode_bs_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.h b/gr-vocoder/lib/g723_24_encode_sb_impl.h index 7c1d5edcf1..15beee2b3f 100644 --- a/gr-vocoder/lib/g723_24_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_24_encode_sb_impl.h @@ -27,7 +27,7 @@ private: public: g723_24_encode_sb_impl(); - ~g723_24_encode_sb_impl(); + ~g723_24_encode_sb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.h b/gr-vocoder/lib/g723_40_decode_bs_impl.h index 07ecec7889..c655b7603f 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.h +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.h @@ -27,7 +27,7 @@ private: public: g723_40_decode_bs_impl(); - ~g723_40_decode_bs_impl(); + ~g723_40_decode_bs_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.h b/gr-vocoder/lib/g723_40_encode_sb_impl.h index 1e84fa6cd8..ced4d5912a 100644 --- a/gr-vocoder/lib/g723_40_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_40_encode_sb_impl.h @@ -27,7 +27,7 @@ private: public: g723_40_encode_sb_impl(); - ~g723_40_encode_sb_impl(); + ~g723_40_encode_sb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h index 3041f46255..fe0a33942e 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h @@ -27,7 +27,7 @@ private: public: gsm_fr_decode_ps_impl(); - ~gsm_fr_decode_ps_impl(); + ~gsm_fr_decode_ps_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h index 390224ddb7..850c309692 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h @@ -27,7 +27,7 @@ private: public: gsm_fr_encode_sp_impl(); - ~gsm_fr_encode_sp_impl(); + ~gsm_fr_encode_sp_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.h b/gr-vocoder/lib/ulaw_decode_bs_impl.h index 9b0927105f..1f0ef3e508 100644 --- a/gr-vocoder/lib/ulaw_decode_bs_impl.h +++ b/gr-vocoder/lib/ulaw_decode_bs_impl.h @@ -20,7 +20,7 @@ class ulaw_decode_bs_impl : public ulaw_decode_bs { public: ulaw_decode_bs_impl(); - ~ulaw_decode_bs_impl(); + ~ulaw_decode_bs_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.h b/gr-vocoder/lib/ulaw_encode_sb_impl.h index bb54f7a105..de76ff8f74 100644 --- a/gr-vocoder/lib/ulaw_encode_sb_impl.h +++ b/gr-vocoder/lib/ulaw_encode_sb_impl.h @@ -20,7 +20,7 @@ class ulaw_encode_sb_impl : public ulaw_encode_sb { public: ulaw_encode_sb_impl(); - ~ulaw_encode_sb_impl(); + ~ulaw_encode_sb_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, |