summaryrefslogtreecommitdiff
path: root/gr-trellis/lib
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2020-10-30 18:22:33 +0100
committermormj <34754695+mormj@users.noreply.github.com>2020-11-03 14:07:23 -0500
commit0ddc7dbc95ca6fb4c4a62a3c027104d6dd71fc3b (patch)
treeb454053fdc123711f3011b8a703de38e1d783ba3 /gr-trellis/lib
parent1cfd6287635e339b313e1826fdfda23f474c91c8 (diff)
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-trellis/lib')
-rw-r--r--gr-trellis/lib/constellation_metrics_cf_impl.h2
-rw-r--r--gr-trellis/lib/encoder_impl.h14
-rw-r--r--gr-trellis/lib/metrics_impl.h18
-rw-r--r--gr-trellis/lib/pccc_decoder_blk_impl.h22
-rw-r--r--gr-trellis/lib/pccc_decoder_combined_blk_impl.h32
-rw-r--r--gr-trellis/lib/pccc_encoder_impl.h16
-rw-r--r--gr-trellis/lib/permutation_impl.h16
-rw-r--r--gr-trellis/lib/sccc_decoder_blk_impl.h22
-rw-r--r--gr-trellis/lib/sccc_decoder_combined_blk_impl.h32
-rw-r--r--gr-trellis/lib/sccc_encoder_impl.h16
-rw-r--r--gr-trellis/lib/siso_combined_f_impl.h42
-rw-r--r--gr-trellis/lib/siso_f_impl.h30
-rw-r--r--gr-trellis/lib/viterbi_combined_impl.h30
-rw-r--r--gr-trellis/lib/viterbi_impl.h18
14 files changed, 155 insertions, 155 deletions
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.h b/gr-trellis/lib/constellation_metrics_cf_impl.h
index 140e9fcbd4..c575de6fd6 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.h
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.h
@@ -28,7 +28,7 @@ private:
public:
constellation_metrics_cf_impl(digital::constellation_sptr constellation,
digital::trellis_metric_type_t TYPE);
- ~constellation_metrics_cf_impl();
+ ~constellation_metrics_cf_impl() override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/encoder_impl.h b/gr-trellis/lib/encoder_impl.h
index a80c1dc46d..88f87e4cfd 100644
--- a/gr-trellis/lib/encoder_impl.h
+++ b/gr-trellis/lib/encoder_impl.h
@@ -28,18 +28,18 @@ private:
public:
encoder_impl(const fsm& FSM, int ST, int K, bool B);
- ~encoder_impl();
+ ~encoder_impl() override;
- fsm FSM() const
+ fsm FSM() const override
{
return d_FSM;
;
}
- int ST() const { return d_ST; }
- int K() const { return d_K; }
- void set_FSM(const fsm& FSM);
- void set_ST(int ST);
- void set_K(int K);
+ int ST() const override { return d_ST; }
+ int K() const override { return d_K; }
+ void set_FSM(const fsm& FSM) override;
+ void set_ST(int ST) override;
+ void set_K(int K) override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
diff --git a/gr-trellis/lib/metrics_impl.h b/gr-trellis/lib/metrics_impl.h
index a7bcdd48d4..1c03796d59 100644
--- a/gr-trellis/lib/metrics_impl.h
+++ b/gr-trellis/lib/metrics_impl.h
@@ -31,17 +31,17 @@ public:
int D,
const std::vector<T>& TABLE,
digital::trellis_metric_type_t TYPE);
- ~metrics_impl();
+ ~metrics_impl() override;
- int O() const { return d_O; }
- int D() const { return d_D; }
- digital::trellis_metric_type_t TYPE() const { return d_TYPE; }
- std::vector<T> TABLE() const { return d_TABLE; }
+ int O() const override { return d_O; }
+ int D() const override { return d_D; }
+ digital::trellis_metric_type_t TYPE() const override { return d_TYPE; }
+ std::vector<T> TABLE() const override { return d_TABLE; }
- void set_O(int O);
- void set_D(int D);
- void set_TYPE(digital::trellis_metric_type_t type);
- void set_TABLE(const std::vector<T>& table);
+ void set_O(int O) override;
+ void set_D(int D) override;
+ void set_TYPE(digital::trellis_metric_type_t type) override;
+ void set_TABLE(const std::vector<T>& table) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/pccc_decoder_blk_impl.h b/gr-trellis/lib/pccc_decoder_blk_impl.h
index ae72d9011f..07dcd58df5 100644
--- a/gr-trellis/lib/pccc_decoder_blk_impl.h
+++ b/gr-trellis/lib/pccc_decoder_blk_impl.h
@@ -44,18 +44,18 @@ public:
int blocklength,
int repetitions,
siso_type_t SISO_TYPE);
- ~pccc_decoder_blk_impl();
+ ~pccc_decoder_blk_impl() override;
- fsm FSM1() const { return d_FSM1; }
- fsm FSM2() const { return d_FSM2; }
- int ST10() const { return d_ST10; }
- int ST1K() const { return d_ST1K; }
- int ST20() const { return d_ST20; }
- int ST2K() const { return d_ST2K; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
- int repetitions() const { return d_repetitions; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
+ fsm FSM1() const override { return d_FSM1; }
+ fsm FSM2() const override { return d_FSM2; }
+ int ST10() const override { return d_ST10; }
+ int ST1K() const override { return d_ST1K; }
+ int ST20() const override { return d_ST20; }
+ int ST2K() const override { return d_ST2K; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
+ int repetitions() const override { return d_repetitions; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/pccc_decoder_combined_blk_impl.h b/gr-trellis/lib/pccc_decoder_combined_blk_impl.h
index 2b3597b4ed..08fc618e52 100644
--- a/gr-trellis/lib/pccc_decoder_combined_blk_impl.h
+++ b/gr-trellis/lib/pccc_decoder_combined_blk_impl.h
@@ -51,23 +51,23 @@ public:
const std::vector<IN_T>& TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling);
- ~pccc_decoder_combined_blk_impl();
+ ~pccc_decoder_combined_blk_impl() override;
- fsm FSM1() const { return d_FSMo; }
- fsm FSM2() const { return d_FSMi; }
- int ST10() const { return d_STo0; }
- int ST1K() const { return d_SToK; }
- int ST20() const { return d_STi0; }
- int ST2K() const { return d_STiK; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
- int repetitions() const { return d_repetitions; }
- int D() const { return d_D; }
- std::vector<IN_T> TABLE() const { return d_TABLE; }
- digital::trellis_metric_type_t METRIC_TYPE() const { return d_METRIC_TYPE; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
- float scaling() const { return d_scaling; }
- void set_scaling(float scaling);
+ fsm FSM1() const override { return d_FSMo; }
+ fsm FSM2() const override { return d_FSMi; }
+ int ST10() const override { return d_STo0; }
+ int ST1K() const override { return d_SToK; }
+ int ST20() const override { return d_STi0; }
+ int ST2K() const override { return d_STiK; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
+ int repetitions() const override { return d_repetitions; }
+ int D() const override { return d_D; }
+ std::vector<IN_T> TABLE() const override { return d_TABLE; }
+ digital::trellis_metric_type_t METRIC_TYPE() const override { return d_METRIC_TYPE; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
+ float scaling() const override { return d_scaling; }
+ void set_scaling(float scaling) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/pccc_encoder_impl.h b/gr-trellis/lib/pccc_encoder_impl.h
index 19b1cddcdd..91008fcacf 100644
--- a/gr-trellis/lib/pccc_encoder_impl.h
+++ b/gr-trellis/lib/pccc_encoder_impl.h
@@ -35,14 +35,14 @@ public:
int ST2,
const interleaver& INTERLEAVER,
int blocklength);
- ~pccc_encoder_impl();
-
- fsm FSM1() const { return d_FSM1; }
- int ST1() const { return d_ST1; }
- fsm FSM2() const { return d_FSM2; }
- int ST2() const { return d_ST2; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
+ ~pccc_encoder_impl() override;
+
+ fsm FSM1() const override { return d_FSM1; }
+ int ST1() const override { return d_ST1; }
+ fsm FSM2() const override { return d_FSM2; }
+ int ST2() const override { return d_ST2; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
int work(int noutput_items,
gr_vector_const_void_star& input_items,
diff --git a/gr-trellis/lib/permutation_impl.h b/gr-trellis/lib/permutation_impl.h
index 44e349a04e..22a6dba8aa 100644
--- a/gr-trellis/lib/permutation_impl.h
+++ b/gr-trellis/lib/permutation_impl.h
@@ -30,16 +30,16 @@ public:
const std::vector<int>& TABLE,
int SYMS_PER_BLOCK,
size_t NBYTES);
- ~permutation_impl();
+ ~permutation_impl() override;
- int K() const { return d_K; }
- std::vector<int> TABLE() const { return d_TABLE; }
- int SYMS_PER_BLOCK() const { return d_SYMS_PER_BLOCK; }
- size_t BYTES_PER_SYMBOL() const { return d_BYTES_PER_SYMBOL; }
+ int K() const override { return d_K; }
+ std::vector<int> TABLE() const override { return d_TABLE; }
+ int SYMS_PER_BLOCK() const override { return d_SYMS_PER_BLOCK; }
+ size_t BYTES_PER_SYMBOL() const override { return d_BYTES_PER_SYMBOL; }
- void set_K(int K);
- void set_TABLE(const std::vector<int>& table);
- void set_SYMS_PER_BLOCK(int spb);
+ void set_K(int K) override;
+ void set_TABLE(const std::vector<int>& table) override;
+ void set_SYMS_PER_BLOCK(int spb) override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
diff --git a/gr-trellis/lib/sccc_decoder_blk_impl.h b/gr-trellis/lib/sccc_decoder_blk_impl.h
index 9ca91ba5dd..c998afd4a0 100644
--- a/gr-trellis/lib/sccc_decoder_blk_impl.h
+++ b/gr-trellis/lib/sccc_decoder_blk_impl.h
@@ -44,18 +44,18 @@ public:
int blocklength,
int repetitions,
siso_type_t SISO_TYPE);
- ~sccc_decoder_blk_impl();
+ ~sccc_decoder_blk_impl() override;
- fsm FSMo() const { return d_FSMo; }
- fsm FSMi() const { return d_FSMi; }
- int STo0() const { return d_STo0; }
- int SToK() const { return d_SToK; }
- int STi0() const { return d_STi0; }
- int STiK() const { return d_STiK; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
- int repetitions() const { return d_repetitions; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
+ fsm FSMo() const override { return d_FSMo; }
+ fsm FSMi() const override { return d_FSMi; }
+ int STo0() const override { return d_STo0; }
+ int SToK() const override { return d_SToK; }
+ int STi0() const override { return d_STi0; }
+ int STiK() const override { return d_STiK; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
+ int repetitions() const override { return d_repetitions; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/sccc_decoder_combined_blk_impl.h b/gr-trellis/lib/sccc_decoder_combined_blk_impl.h
index 644a6bebe5..2201eb307a 100644
--- a/gr-trellis/lib/sccc_decoder_combined_blk_impl.h
+++ b/gr-trellis/lib/sccc_decoder_combined_blk_impl.h
@@ -51,23 +51,23 @@ public:
const std::vector<IN_T>& TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling);
- ~sccc_decoder_combined_blk_impl();
+ ~sccc_decoder_combined_blk_impl() override;
- fsm FSMo() const { return d_FSMo; }
- fsm FSMi() const { return d_FSMi; }
- int STo0() const { return d_STo0; }
- int SToK() const { return d_SToK; }
- int STi0() const { return d_STi0; }
- int STiK() const { return d_STiK; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
- int repetitions() const { return d_repetitions; }
- int D() const { return d_D; }
- std::vector<IN_T> TABLE() const { return d_TABLE; }
- digital::trellis_metric_type_t METRIC_TYPE() const { return d_METRIC_TYPE; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
- float scaling() const { return d_scaling; }
- void set_scaling(float scaling);
+ fsm FSMo() const override { return d_FSMo; }
+ fsm FSMi() const override { return d_FSMi; }
+ int STo0() const override { return d_STo0; }
+ int SToK() const override { return d_SToK; }
+ int STi0() const override { return d_STi0; }
+ int STiK() const override { return d_STiK; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
+ int repetitions() const override { return d_repetitions; }
+ int D() const override { return d_D; }
+ std::vector<IN_T> TABLE() const override { return d_TABLE; }
+ digital::trellis_metric_type_t METRIC_TYPE() const override { return d_METRIC_TYPE; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
+ float scaling() const override { return d_scaling; }
+ void set_scaling(float scaling) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/sccc_encoder_impl.h b/gr-trellis/lib/sccc_encoder_impl.h
index 38fa226155..17331d2cca 100644
--- a/gr-trellis/lib/sccc_encoder_impl.h
+++ b/gr-trellis/lib/sccc_encoder_impl.h
@@ -35,14 +35,14 @@ public:
int STi,
const interleaver& INTERLEAVER,
int blocklength);
- ~sccc_encoder_impl();
-
- fsm FSMo() const { return d_FSMo; }
- int STo() const { return d_STo; }
- fsm FSMi() const { return d_FSMi; }
- int STi() const { return d_STi; }
- interleaver INTERLEAVER() const { return d_INTERLEAVER; }
- int blocklength() const { return d_blocklength; }
+ ~sccc_encoder_impl() override;
+
+ fsm FSMo() const override { return d_FSMo; }
+ int STo() const override { return d_STo; }
+ fsm FSMi() const override { return d_FSMi; }
+ int STi() const override { return d_STi; }
+ interleaver INTERLEAVER() const override { return d_INTERLEAVER; }
+ int blocklength() const override { return d_blocklength; }
int work(int noutput_items,
gr_vector_const_void_star& input_items,
diff --git a/gr-trellis/lib/siso_combined_f_impl.h b/gr-trellis/lib/siso_combined_f_impl.h
index c3ade26262..15e2b679d2 100644
--- a/gr-trellis/lib/siso_combined_f_impl.h
+++ b/gr-trellis/lib/siso_combined_f_impl.h
@@ -44,29 +44,29 @@ public:
int D,
const std::vector<float>& TABLE,
digital::trellis_metric_type_t TYPE);
- ~siso_combined_f_impl();
+ ~siso_combined_f_impl() override;
- fsm FSM() const { return d_FSM; }
- int K() const { return d_K; }
- int S0() const { return d_S0; }
- int SK() const { return d_SK; }
- bool POSTI() const { return d_POSTI; }
- bool POSTO() const { return d_POSTO; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
- int D() const { return d_D; }
- std::vector<float> TABLE() const { return d_TABLE; }
- digital::trellis_metric_type_t TYPE() const { return d_TYPE; }
+ fsm FSM() const override { return d_FSM; }
+ int K() const override { return d_K; }
+ int S0() const override { return d_S0; }
+ int SK() const override { return d_SK; }
+ bool POSTI() const override { return d_POSTI; }
+ bool POSTO() const override { return d_POSTO; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
+ int D() const override { return d_D; }
+ std::vector<float> TABLE() const override { return d_TABLE; }
+ digital::trellis_metric_type_t TYPE() const override { return d_TYPE; }
- void set_FSM(const fsm& FSM);
- void set_K(int K);
- void set_S0(int S0);
- void set_SK(int SK);
- void set_POSTI(bool POSTI);
- void set_POSTO(bool POSTO);
- void set_SISO_TYPE(trellis::siso_type_t type);
- void set_D(int D);
- void set_TABLE(const std::vector<float>& table);
- void set_TYPE(digital::trellis_metric_type_t type);
+ void set_FSM(const fsm& FSM) override;
+ void set_K(int K) override;
+ void set_S0(int S0) override;
+ void set_SK(int SK) override;
+ void set_POSTI(bool POSTI) override;
+ void set_POSTO(bool POSTO) override;
+ void set_SISO_TYPE(trellis::siso_type_t type) override;
+ void set_D(int D) override;
+ void set_TABLE(const std::vector<float>& table) override;
+ void set_TYPE(digital::trellis_metric_type_t type) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h
index a47a45c372..8bd2cffc80 100644
--- a/gr-trellis/lib/siso_f_impl.h
+++ b/gr-trellis/lib/siso_f_impl.h
@@ -42,23 +42,23 @@ public:
bool POSTI,
bool POSTO,
siso_type_t d_SISO_TYPE);
- ~siso_f_impl();
+ ~siso_f_impl() override;
- fsm FSM() const { return d_FSM; }
- int K() const { return d_K; }
- int S0() const { return d_S0; }
- int SK() const { return d_SK; }
- bool POSTI() const { return d_POSTI; }
- bool POSTO() const { return d_POSTO; }
- siso_type_t SISO_TYPE() const { return d_SISO_TYPE; }
+ fsm FSM() const override { return d_FSM; }
+ int K() const override { return d_K; }
+ int S0() const override { return d_S0; }
+ int SK() const override { return d_SK; }
+ bool POSTI() const override { return d_POSTI; }
+ bool POSTO() const override { return d_POSTO; }
+ siso_type_t SISO_TYPE() const override { return d_SISO_TYPE; }
- void set_FSM(const fsm& FSM);
- void set_K(int K);
- void set_S0(int S0);
- void set_SK(int SK);
- void set_POSTI(bool POSTI);
- void set_POSTO(bool POSTO);
- void set_SISO_TYPE(trellis::siso_type_t type);
+ void set_FSM(const fsm& FSM) override;
+ void set_K(int K) override;
+ void set_S0(int S0) override;
+ void set_SK(int SK) override;
+ void set_POSTI(bool POSTI) override;
+ void set_POSTO(bool POSTO) override;
+ void set_SISO_TYPE(trellis::siso_type_t type) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/viterbi_combined_impl.h b/gr-trellis/lib/viterbi_combined_impl.h
index 3dc09ea768..107e0c7523 100644
--- a/gr-trellis/lib/viterbi_combined_impl.h
+++ b/gr-trellis/lib/viterbi_combined_impl.h
@@ -37,24 +37,24 @@ public:
int D,
const std::vector<IN_T>& TABLE,
digital::trellis_metric_type_t TYPE);
- ~viterbi_combined_impl();
+ ~viterbi_combined_impl() override;
- fsm FSM() const { return d_FSM; }
- int K() const { return d_K; }
- int S0() const { return d_S0; }
- int SK() const { return d_SK; }
- int D() const { return d_D; }
- std::vector<IN_T> TABLE() const { return d_TABLE; }
- digital::trellis_metric_type_t TYPE() const { return d_TYPE; }
+ fsm FSM() const override { return d_FSM; }
+ int K() const override { return d_K; }
+ int S0() const override { return d_S0; }
+ int SK() const override { return d_SK; }
+ int D() const override { return d_D; }
+ std::vector<IN_T> TABLE() const override { return d_TABLE; }
+ digital::trellis_metric_type_t TYPE() const override { return d_TYPE; }
// std::vector<int> trace() const { return d_trace; }
- void set_FSM(const fsm& FSM);
- void set_K(int K);
- void set_S0(int S0);
- void set_SK(int SK);
- void set_D(int D);
- void set_TABLE(const std::vector<IN_T>& table);
- void set_TYPE(digital::trellis_metric_type_t type);
+ void set_FSM(const fsm& FSM) override;
+ void set_K(int K) override;
+ void set_S0(int S0) override;
+ void set_SK(int SK) override;
+ void set_D(int D) override;
+ void set_TABLE(const std::vector<IN_T>& table) override;
+ void set_TYPE(digital::trellis_metric_type_t type) override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
diff --git a/gr-trellis/lib/viterbi_impl.h b/gr-trellis/lib/viterbi_impl.h
index 07b7e1843f..bcb9716598 100644
--- a/gr-trellis/lib/viterbi_impl.h
+++ b/gr-trellis/lib/viterbi_impl.h
@@ -29,17 +29,17 @@ private:
public:
viterbi_impl(const fsm& FSM, int K, int S0, int SK);
- ~viterbi_impl();
+ ~viterbi_impl() override;
- fsm FSM() const { return d_FSM; }
- int K() const { return d_K; }
- int S0() const { return d_S0; }
- int SK() const { return d_SK; }
+ fsm FSM() const override { return d_FSM; }
+ int K() const override { return d_K; }
+ int S0() const override { return d_S0; }
+ int SK() const override { return d_SK; }
- void set_FSM(const fsm& FSM);
- void set_K(int K);
- void set_S0(int S0);
- void set_SK(int SK);
+ void set_FSM(const fsm& FSM) override;
+ void set_K(int K) override;
+ void set_S0(int S0) override;
+ void set_SK(int SK) override;
// std::vector<int> trace () const { return d_trace; }
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 12:09:03 +0000