diff options
author | Thomas Habets <thomas@habets.se> | 2020-08-26 21:09:02 +0100 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-11-03 14:07:23 -0500 |
commit | 1cfd6287635e339b313e1826fdfda23f474c91c8 (patch) | |
tree | 1e67c4fe9e800e9f4e3d0c86831b759c8a819954 /gr-trellis | |
parent | usrp_block:pybind: add missing bind for cmd_power_key (diff) | |
download | gnuradio-1cfd6287635e339b313e1826fdfda23f474c91c8.tar.xz gnuradio-1cfd6287635e339b313e1826fdfda23f474c91c8.zip |
Add `override` for common virtual function overrides
Mostly done with:
```
find -name "*_impl.h" | xargs sed -i -r '/(void forecast|int work|int general_work|bool check_topology)\(/{:back /\)/b nxt;N;b back;:nxt s/\)$|\)(;)/) override\1/g}'
```
Then I removed an incorrect `work` that this found.
Diffstat (limited to 'gr-trellis')
-rw-r--r-- | gr-trellis/lib/constellation_metrics_cf_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/encoder_impl.h | 2 | ||||
-rw-r--r-- | gr-trellis/lib/metrics_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/pccc_decoder_blk_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/pccc_decoder_combined_blk_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/pccc_encoder_impl.h | 2 | ||||
-rw-r--r-- | gr-trellis/lib/permutation_impl.h | 2 | ||||
-rw-r--r-- | gr-trellis/lib/sccc_decoder_blk_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/sccc_decoder_combined_blk_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/sccc_encoder_impl.h | 2 | ||||
-rw-r--r-- | gr-trellis/lib/siso_combined_f_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/siso_f_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/viterbi_combined_impl.h | 4 | ||||
-rw-r--r-- | gr-trellis/lib/viterbi_impl.h | 4 |
14 files changed, 24 insertions, 24 deletions
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.h b/gr-trellis/lib/constellation_metrics_cf_impl.h index d07a15b61..140e9fcbd 100644 --- a/gr-trellis/lib/constellation_metrics_cf_impl.h +++ b/gr-trellis/lib/constellation_metrics_cf_impl.h @@ -30,12 +30,12 @@ public: digital::trellis_metric_type_t TYPE); ~constellation_metrics_cf_impl(); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/encoder_impl.h b/gr-trellis/lib/encoder_impl.h index 69dc8f503..a80c1dc46 100644 --- a/gr-trellis/lib/encoder_impl.h +++ b/gr-trellis/lib/encoder_impl.h @@ -42,7 +42,7 @@ public: void set_K(int K); int work(int noutput_items, gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/metrics_impl.h b/gr-trellis/lib/metrics_impl.h index 91e9421f2..a7bcdd48d 100644 --- a/gr-trellis/lib/metrics_impl.h +++ b/gr-trellis/lib/metrics_impl.h @@ -43,12 +43,12 @@ public: void set_TYPE(digital::trellis_metric_type_t type); void set_TABLE(const std::vector<T>& table); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/pccc_decoder_blk_impl.h b/gr-trellis/lib/pccc_decoder_blk_impl.h index 3d2abeaec..ae72d9011 100644 --- a/gr-trellis/lib/pccc_decoder_blk_impl.h +++ b/gr-trellis/lib/pccc_decoder_blk_impl.h @@ -57,12 +57,12 @@ public: int repetitions() const { return d_repetitions; } siso_type_t SISO_TYPE() const { return d_SISO_TYPE; } - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/pccc_decoder_combined_blk_impl.h b/gr-trellis/lib/pccc_decoder_combined_blk_impl.h index 95259e746..2b3597b4e 100644 --- a/gr-trellis/lib/pccc_decoder_combined_blk_impl.h +++ b/gr-trellis/lib/pccc_decoder_combined_blk_impl.h @@ -69,12 +69,12 @@ public: float scaling() const { return d_scaling; } void set_scaling(float scaling); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/pccc_encoder_impl.h b/gr-trellis/lib/pccc_encoder_impl.h index 986bcb400..19b1cddcd 100644 --- a/gr-trellis/lib/pccc_encoder_impl.h +++ b/gr-trellis/lib/pccc_encoder_impl.h @@ -46,7 +46,7 @@ public: int work(int noutput_items, gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/permutation_impl.h b/gr-trellis/lib/permutation_impl.h index 8c160c2c1..44e349a04 100644 --- a/gr-trellis/lib/permutation_impl.h +++ b/gr-trellis/lib/permutation_impl.h @@ -43,7 +43,7 @@ public: int work(int noutput_items, gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/sccc_decoder_blk_impl.h b/gr-trellis/lib/sccc_decoder_blk_impl.h index 499c8a3bc..9ca91ba5d 100644 --- a/gr-trellis/lib/sccc_decoder_blk_impl.h +++ b/gr-trellis/lib/sccc_decoder_blk_impl.h @@ -57,12 +57,12 @@ public: int repetitions() const { return d_repetitions; } siso_type_t SISO_TYPE() const { return d_SISO_TYPE; } - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/sccc_decoder_combined_blk_impl.h b/gr-trellis/lib/sccc_decoder_combined_blk_impl.h index 4bdcdbadb..644a6bebe 100644 --- a/gr-trellis/lib/sccc_decoder_combined_blk_impl.h +++ b/gr-trellis/lib/sccc_decoder_combined_blk_impl.h @@ -69,12 +69,12 @@ public: float scaling() const { return d_scaling; } void set_scaling(float scaling); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/sccc_encoder_impl.h b/gr-trellis/lib/sccc_encoder_impl.h index 3220859f0..38fa22615 100644 --- a/gr-trellis/lib/sccc_encoder_impl.h +++ b/gr-trellis/lib/sccc_encoder_impl.h @@ -46,7 +46,7 @@ public: int work(int noutput_items, gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/siso_combined_f_impl.h b/gr-trellis/lib/siso_combined_f_impl.h index 237c6d09e..c3ade2626 100644 --- a/gr-trellis/lib/siso_combined_f_impl.h +++ b/gr-trellis/lib/siso_combined_f_impl.h @@ -68,12 +68,12 @@ public: void set_TABLE(const std::vector<float>& table); void set_TYPE(digital::trellis_metric_type_t type); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h index 14b73d941..a47a45c37 100644 --- a/gr-trellis/lib/siso_f_impl.h +++ b/gr-trellis/lib/siso_f_impl.h @@ -60,12 +60,12 @@ public: void set_POSTO(bool POSTO); void set_SISO_TYPE(trellis::siso_type_t type); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/viterbi_combined_impl.h b/gr-trellis/lib/viterbi_combined_impl.h index 397f53c29..3dc09ea76 100644 --- a/gr-trellis/lib/viterbi_combined_impl.h +++ b/gr-trellis/lib/viterbi_combined_impl.h @@ -56,12 +56,12 @@ public: void set_TABLE(const std::vector<IN_T>& table); void set_TYPE(digital::trellis_metric_type_t type); - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ diff --git a/gr-trellis/lib/viterbi_impl.h b/gr-trellis/lib/viterbi_impl.h index 87d866a5b..07b7e1843 100644 --- a/gr-trellis/lib/viterbi_impl.h +++ b/gr-trellis/lib/viterbi_impl.h @@ -42,11 +42,11 @@ public: void set_SK(int SK); // std::vector<int> trace () const { return d_trace; } - void forecast(int noutput_items, gr_vector_int& ninput_items_required); + void forecast(int noutput_items, gr_vector_int& ninput_items_required) 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); + gr_vector_void_star& output_items) override; }; } /* namespace trellis */ |