summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorThomas Habets <thomas@habets.se>2020-08-26 21:09:02 +0100
committermormj <34754695+mormj@users.noreply.github.com>2020-11-03 14:07:23 -0500
commit1cfd6287635e339b313e1826fdfda23f474c91c8 (patch)
tree1e67c4fe9e800e9f4e3d0c86831b759c8a819954 /gr-trellis
parentfe2b23ce9f0eb3e2ccd73db0568c265c22cd6603 (diff)
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.h4
-rw-r--r--gr-trellis/lib/encoder_impl.h2
-rw-r--r--gr-trellis/lib/metrics_impl.h4
-rw-r--r--gr-trellis/lib/pccc_decoder_blk_impl.h4
-rw-r--r--gr-trellis/lib/pccc_decoder_combined_blk_impl.h4
-rw-r--r--gr-trellis/lib/pccc_encoder_impl.h2
-rw-r--r--gr-trellis/lib/permutation_impl.h2
-rw-r--r--gr-trellis/lib/sccc_decoder_blk_impl.h4
-rw-r--r--gr-trellis/lib/sccc_decoder_combined_blk_impl.h4
-rw-r--r--gr-trellis/lib/sccc_encoder_impl.h2
-rw-r--r--gr-trellis/lib/siso_combined_f_impl.h4
-rw-r--r--gr-trellis/lib/siso_f_impl.h4
-rw-r--r--gr-trellis/lib/viterbi_combined_impl.h4
-rw-r--r--gr-trellis/lib/viterbi_impl.h4
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 d07a15b618..140e9fcbd4 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 69dc8f5035..a80c1dc46d 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 91e9421f2e..a7bcdd48d4 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 3d2abeaeca..ae72d9011f 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 95259e746f..2b3597b4ed 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 986bcb4005..19b1cddcdd 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 8c160c2c10..44e349a04e 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 499c8a3bcb..9ca91ba5dd 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 4bdcdbadbc..644a6bebe5 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 3220859f0c..38fa226155 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 237c6d09e3..c3ade26262 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 14b73d941b..a47a45c372 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 397f53c291..3dc09ea768 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 87d866a5b4..07b7e1843f 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 */
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-25 13:49:03 +0000