diff options
Diffstat (limited to 'gr-blocks/lib')
108 files changed, 322 insertions, 316 deletions
diff --git a/gr-blocks/lib/add_const_bb_impl.h b/gr-blocks/lib/add_const_bb_impl.h index f57031afc4..c8df1a1235 100644 --- a/gr-blocks/lib/add_const_bb_impl.h +++ b/gr-blocks/lib/add_const_bb_impl.h @@ -23,12 +23,12 @@ private: public: add_const_bb_impl(unsigned char k); - ~add_const_bb_impl(); + ~add_const_bb_impl() override; - void setup_rpc(); + void setup_rpc() override; - unsigned char k() const { return d_k; } - void set_k(unsigned char k) { d_k = k; } + unsigned char k() const override { return d_k; } + void set_k(unsigned char k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/add_const_cc_impl.h b/gr-blocks/lib/add_const_cc_impl.h index 30a08153da..dc9bc415ee 100644 --- a/gr-blocks/lib/add_const_cc_impl.h +++ b/gr-blocks/lib/add_const_cc_impl.h @@ -25,11 +25,11 @@ private: public: add_const_cc_impl(gr_complex k); - void setup_rpc(); + void setup_rpc() override; - gr_complex k() const { return d_k; } + gr_complex k() const override { return d_k; } - void set_k(gr_complex k); + void set_k(gr_complex k) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/add_const_ff_impl.h b/gr-blocks/lib/add_const_ff_impl.h index 630d754990..f7b1502423 100644 --- a/gr-blocks/lib/add_const_ff_impl.h +++ b/gr-blocks/lib/add_const_ff_impl.h @@ -25,11 +25,11 @@ private: public: add_const_ff_impl(float k); - void setup_rpc(); + void setup_rpc() override; - float k() const { return d_k; } + float k() const override { return d_k; } - void set_k(float k); + void set_k(float k) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/add_const_ii_impl.h b/gr-blocks/lib/add_const_ii_impl.h index aea1b6cfe8..c3180ab727 100644 --- a/gr-blocks/lib/add_const_ii_impl.h +++ b/gr-blocks/lib/add_const_ii_impl.h @@ -24,10 +24,10 @@ private: public: add_const_ii_impl(int k); - void setup_rpc(); + void setup_rpc() override; - int k() const { return d_k; } - void set_k(int k) { d_k = k; } + int k() const override { return d_k; } + void set_k(int k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/add_const_ss_impl.h b/gr-blocks/lib/add_const_ss_impl.h index ba2a69e1f1..c70601ba8c 100644 --- a/gr-blocks/lib/add_const_ss_impl.h +++ b/gr-blocks/lib/add_const_ss_impl.h @@ -23,12 +23,12 @@ private: public: add_const_ss_impl(short k); - ~add_const_ss_impl(); + ~add_const_ss_impl() override; - void setup_rpc(); + void setup_rpc() override; - short k() const { return d_k; } - void set_k(short k) { d_k = k; } + short k() const override { return d_k; } + void set_k(short k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/add_const_v_impl.h b/gr-blocks/lib/add_const_v_impl.h index 4ababdb072..040882abd7 100644 --- a/gr-blocks/lib/add_const_v_impl.h +++ b/gr-blocks/lib/add_const_v_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API add_const_v_impl : public add_const_v<T> public: add_const_v_impl(std::vector<T> k); - std::vector<T> k() const { return d_k; } - void set_k(std::vector<T> k) { d_k = k; } + std::vector<T> k() const override { return d_k; } + void set_k(std::vector<T> k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/and_const_impl.h b/gr-blocks/lib/and_const_impl.h index e6c283dbad..96d917358f 100644 --- a/gr-blocks/lib/and_const_impl.h +++ b/gr-blocks/lib/and_const_impl.h @@ -25,8 +25,8 @@ class BLOCKS_API and_const_impl : public and_const<T> public: and_const_impl(T k); - T k() const { return d_k; } - void set_k(T k) { d_k = k; } + T k() const override { return d_k; } + void set_k(T k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h index 407e2cb2fc..e7f5888a0c 100644 --- a/gr-blocks/lib/annotator_1to1_impl.h +++ b/gr-blocks/lib/annotator_1to1_impl.h @@ -25,9 +25,9 @@ private: public: annotator_1to1_impl(int when, size_t sizeof_stream_item); - ~annotator_1to1_impl(); + ~annotator_1to1_impl() override; - std::vector<tag_t> data() const { return d_stored_tags; } + std::vector<tag_t> data() const override { return d_stored_tags; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/annotator_alltoall_impl.h b/gr-blocks/lib/annotator_alltoall_impl.h index 8837147e16..d6c9b99fd6 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.h +++ b/gr-blocks/lib/annotator_alltoall_impl.h @@ -25,9 +25,9 @@ private: public: annotator_alltoall_impl(int when, size_t sizeof_stream_item); - ~annotator_alltoall_impl(); + ~annotator_alltoall_impl() override; - std::vector<tag_t> data() const { return d_stored_tags; } + std::vector<tag_t> data() const override { return d_stored_tags; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/annotator_raw_impl.h b/gr-blocks/lib/annotator_raw_impl.h index 7e9623d529..a17b6ae27c 100644 --- a/gr-blocks/lib/annotator_raw_impl.h +++ b/gr-blocks/lib/annotator_raw_impl.h @@ -26,10 +26,10 @@ private: public: annotator_raw_impl(size_t sizeof_stream_item); - ~annotator_raw_impl(); + ~annotator_raw_impl() override; // insert a tag to be added - void add_tag(uint64_t offset, pmt::pmt_t key, pmt::pmt_t val); + void add_tag(uint64_t offset, pmt::pmt_t key, pmt::pmt_t val) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/argmax_impl.h b/gr-blocks/lib/argmax_impl.h index 6b5f046ed5..f2ef29cf46 100644 --- a/gr-blocks/lib/argmax_impl.h +++ b/gr-blocks/lib/argmax_impl.h @@ -24,7 +24,7 @@ private: public: argmax_impl(size_t vlen); - ~argmax_impl(); + ~argmax_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/burst_tagger_impl.h b/gr-blocks/lib/burst_tagger_impl.h index 2ba144fed2..d2458d157a 100644 --- a/gr-blocks/lib/burst_tagger_impl.h +++ b/gr-blocks/lib/burst_tagger_impl.h @@ -31,10 +31,10 @@ private: public: burst_tagger_impl(size_t itemsize); - ~burst_tagger_impl(); + ~burst_tagger_impl() override; - void set_true_tag(const std::string& key, bool value); - void set_false_tag(const std::string& key, bool value); + void set_true_tag(const std::string& key, bool value) override; + void set_false_tag(const std::string& key, bool value) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/char_to_float_impl.h b/gr-blocks/lib/char_to_float_impl.h index 7075cc4002..221f6add2b 100644 --- a/gr-blocks/lib/char_to_float_impl.h +++ b/gr-blocks/lib/char_to_float_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API char_to_float_impl : public char_to_float public: char_to_float_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.h b/gr-blocks/lib/check_lfsr_32k_s_impl.h index c704a85199..102fbc7102 100644 --- a/gr-blocks/lib/check_lfsr_32k_s_impl.h +++ b/gr-blocks/lib/check_lfsr_32k_s_impl.h @@ -65,15 +65,15 @@ private: public: check_lfsr_32k_s_impl(); - ~check_lfsr_32k_s_impl(); + ~check_lfsr_32k_s_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - long ntotal() const { return d_ntotal; } - long nright() const { return d_nright; } - long runlength() const { return d_runlength; } + long ntotal() const override { return d_ntotal; } + long nright() const override { return d_nright; } + long runlength() const override { return d_runlength; } }; } /* namespace blocks */ diff --git a/gr-blocks/lib/complex_to_interleaved_char_impl.h b/gr-blocks/lib/complex_to_interleaved_char_impl.h index 903c64b1ab..4a15a6328e 100644 --- a/gr-blocks/lib/complex_to_interleaved_char_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_char_impl.h @@ -25,7 +25,7 @@ private: public: complex_to_interleaved_char_impl(bool vector, float scale_factor); - virtual void set_scale_factor(float new_value) { d_scalar = new_value; }; + void set_scale_factor(float new_value) override { d_scalar = new_value; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.h b/gr-blocks/lib/complex_to_interleaved_short_impl.h index 282d452d2e..1c860dc561 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.h @@ -25,7 +25,7 @@ private: public: complex_to_interleaved_short_impl(bool vector, float scale_factor); - virtual void set_scale_factor(float new_value) { d_scalar = new_value; }; + void set_scale_factor(float new_value) override { d_scalar = new_value; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/copy_impl.h b/gr-blocks/lib/copy_impl.h index fb6530034b..16c22ef74b 100644 --- a/gr-blocks/lib/copy_impl.h +++ b/gr-blocks/lib/copy_impl.h @@ -24,17 +24,17 @@ private: public: copy_impl(size_t itemsize); - ~copy_impl(); + ~copy_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; bool check_topology(int ninputs, int noutputs) override; void handle_enable(pmt::pmt_t msg); - void setup_rpc(); + void setup_rpc() override; - void set_enabled(bool enable) { d_enabled = enable; } - bool enabled() const { return d_enabled; } + void set_enabled(bool enable) override { d_enabled = enable; } + bool enabled() const override { return d_enabled; } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/correctiq_auto_impl.h b/gr-blocks/lib/correctiq_auto_impl.h index 4088e9a9b5..b0a5f46812 100644 --- a/gr-blocks/lib/correctiq_auto_impl.h +++ b/gr-blocks/lib/correctiq_auto_impl.h @@ -47,7 +47,7 @@ private: public: correctiq_auto_impl(double samp_rate, double freq, float gain, float sync_window); - ~correctiq_auto_impl(); + ~correctiq_auto_impl() override; double get_freq() const override; float get_gain() const override; diff --git a/gr-blocks/lib/correctiq_impl.h b/gr-blocks/lib/correctiq_impl.h index b4514e4f08..8f148c511b 100644 --- a/gr-blocks/lib/correctiq_impl.h +++ b/gr-blocks/lib/correctiq_impl.h @@ -25,7 +25,7 @@ private: public: correctiq_impl(); - ~correctiq_impl(); + ~correctiq_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/correctiq_man_impl.h b/gr-blocks/lib/correctiq_man_impl.h index 44cf774d61..6893f31589 100644 --- a/gr-blocks/lib/correctiq_man_impl.h +++ b/gr-blocks/lib/correctiq_man_impl.h @@ -29,13 +29,13 @@ private: public: correctiq_man_impl(float real, float imag); - ~correctiq_man_impl(); + ~correctiq_man_impl() override; float get_real() const override; float get_imag() const override; - virtual void set_real(float new_value); - virtual void set_imag(float new_value); + void set_real(float new_value) override; + void set_imag(float new_value) override; void handle_real(pmt::pmt_t msg); void handle_imag(pmt::pmt_t msg); diff --git a/gr-blocks/lib/correctiq_swapiq_impl.h b/gr-blocks/lib/correctiq_swapiq_impl.h index a07d5d5570..c38ddb715d 100644 --- a/gr-blocks/lib/correctiq_swapiq_impl.h +++ b/gr-blocks/lib/correctiq_swapiq_impl.h @@ -27,7 +27,7 @@ private: public: swap_iq_impl(int datatype, int datasize); - ~swap_iq_impl(); + ~swap_iq_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-blocks/lib/delay_impl.h b/gr-blocks/lib/delay_impl.h index ce7bde7913..d1ff142830 100644 --- a/gr-blocks/lib/delay_impl.h +++ b/gr-blocks/lib/delay_impl.h @@ -28,10 +28,10 @@ private: public: delay_impl(size_t itemsize, int delay); - ~delay_impl(); + ~delay_impl() override; - int dly() const { return history() - 1; } - void set_dly(int d); + int dly() const override { return history() - 1; } + void set_dly(int d) override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/endian_swap_impl.h b/gr-blocks/lib/endian_swap_impl.h index d3938813e1..1abc8968b9 100644 --- a/gr-blocks/lib/endian_swap_impl.h +++ b/gr-blocks/lib/endian_swap_impl.h @@ -21,7 +21,7 @@ class endian_swap_impl : public endian_swap private: public: endian_swap_impl(size_t item_size_bytes); - ~endian_swap_impl(); + ~endian_swap_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/exponentiate_const_cci_impl.h b/gr-blocks/lib/exponentiate_const_cci_impl.h index db180455bb..8ee31ff301 100644 --- a/gr-blocks/lib/exponentiate_const_cci_impl.h +++ b/gr-blocks/lib/exponentiate_const_cci_impl.h @@ -24,9 +24,9 @@ private: public: exponentiate_const_cci_impl(int exponent, size_t vlen); - ~exponentiate_const_cci_impl(); + ~exponentiate_const_cci_impl() override; bool check_topology(int ninputs, int noutputs) override; - void set_exponent(int exponent); + void set_exponent(int exponent) override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-blocks/lib/file_descriptor_sink_impl.h b/gr-blocks/lib/file_descriptor_sink_impl.h index 366ff8a5bc..ae3ae9799c 100644 --- a/gr-blocks/lib/file_descriptor_sink_impl.h +++ b/gr-blocks/lib/file_descriptor_sink_impl.h @@ -24,7 +24,7 @@ private: public: file_descriptor_sink_impl(size_t itemsize, int fd); - ~file_descriptor_sink_impl(); + ~file_descriptor_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/file_descriptor_source_impl.h b/gr-blocks/lib/file_descriptor_source_impl.h index 6a8f986058..22c9517a6d 100644 --- a/gr-blocks/lib/file_descriptor_source_impl.h +++ b/gr-blocks/lib/file_descriptor_source_impl.h @@ -27,13 +27,13 @@ private: unsigned long d_residue_len; protected: - int read_items(char* buf, int nitems); - int handle_residue(char* buf, int nbytes_read); - void flush_residue() { d_residue_len = 0; } + int read_items(char* buf, int nitems) override; + int handle_residue(char* buf, int nbytes_read) override; + void flush_residue() override { d_residue_len = 0; } public: file_descriptor_source_impl(size_t itemsize, int fd, bool repeat); - ~file_descriptor_source_impl(); + ~file_descriptor_source_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/file_meta_sink_impl.h b/gr-blocks/lib/file_meta_sink_impl.h index 4352e3f646..5684be2e70 100644 --- a/gr-blocks/lib/file_meta_sink_impl.h +++ b/gr-blocks/lib/file_meta_sink_impl.h @@ -60,13 +60,13 @@ public: size_t max_segment_size = 1000000, pmt::pmt_t extra_dict = pmt::make_dict(), bool detached_header = false); - ~file_meta_sink_impl(); + ~file_meta_sink_impl() override; - bool open(const std::string& filename); - void close(); - void do_update(); + bool open(const std::string& filename) override; + void close() override; + void do_update() override; - void set_unbuffered(bool unbuffered) { d_unbuffered = unbuffered; } + void set_unbuffered(bool unbuffered) override { d_unbuffered = unbuffered; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h index 6d3c72ff46..8b2d5332b6 100644 --- a/gr-blocks/lib/file_meta_source_impl.h +++ b/gr-blocks/lib/file_meta_source_impl.h @@ -53,11 +53,11 @@ public: bool detached_header = false, const std::string& hdr_filename = ""); - ~file_meta_source_impl(); + ~file_meta_source_impl() override; - bool open(const std::string& filename, const std::string& hdr_filename = ""); - void close(); - void do_update(); + bool open(const std::string& filename, const std::string& hdr_filename = "") override; + void close() override; + void do_update() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/file_sink_impl.h b/gr-blocks/lib/file_sink_impl.h index 0a080baba1..89c2663df6 100644 --- a/gr-blocks/lib/file_sink_impl.h +++ b/gr-blocks/lib/file_sink_impl.h @@ -23,7 +23,7 @@ private: public: file_sink_impl(size_t itemsize, const char* filename, bool append = false); - ~file_sink_impl(); + ~file_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h index 10d8828dfb..c3c2f1997c 100644 --- a/gr-blocks/lib/file_source_impl.h +++ b/gr-blocks/lib/file_source_impl.h @@ -44,17 +44,17 @@ public: bool repeat, uint64_t offset, uint64_t len); - ~file_source_impl(); + ~file_source_impl() override; - bool seek(int64_t seek_point, int whence); - void open(const char* filename, bool repeat, uint64_t offset, uint64_t len); - void close(); + bool seek(int64_t seek_point, int whence) override; + void open(const char* filename, bool repeat, uint64_t offset, uint64_t len) override; + void close() override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void set_begin_tag(pmt::pmt_t val); + void set_begin_tag(pmt::pmt_t val) override; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/float_to_char_impl.h b/gr-blocks/lib/float_to_char_impl.h index fd2ade9658..3fc2dde4ac 100644 --- a/gr-blocks/lib/float_to_char_impl.h +++ b/gr-blocks/lib/float_to_char_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API float_to_char_impl : public float_to_char public: float_to_char_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/float_to_int_impl.h b/gr-blocks/lib/float_to_int_impl.h index 53d8365f3d..72459067ce 100644 --- a/gr-blocks/lib/float_to_int_impl.h +++ b/gr-blocks/lib/float_to_int_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API float_to_int_impl : public float_to_int public: float_to_int_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/float_to_short_impl.h b/gr-blocks/lib/float_to_short_impl.h index 839e017ca1..c0da8461bd 100644 --- a/gr-blocks/lib/float_to_short_impl.h +++ b/gr-blocks/lib/float_to_short_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API float_to_short_impl : public float_to_short public: float_to_short_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/head_impl.h b/gr-blocks/lib/head_impl.h index a973dd6be9..5332c33d95 100644 --- a/gr-blocks/lib/head_impl.h +++ b/gr-blocks/lib/head_impl.h @@ -24,10 +24,10 @@ private: public: head_impl(size_t sizeof_stream_item, uint64_t nitems); - ~head_impl(); + ~head_impl() override; - void reset() { d_ncopied_items = 0; } - void set_length(uint64_t nitems) { d_nitems = nitems; } + void reset() override { d_ncopied_items = 0; } + void set_length(uint64_t nitems) override { d_nitems = nitems; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/int_to_float_impl.h b/gr-blocks/lib/int_to_float_impl.h index 07c781ed41..f2c628d36d 100644 --- a/gr-blocks/lib/int_to_float_impl.h +++ b/gr-blocks/lib/int_to_float_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API int_to_float_impl : public int_to_float public: int_to_float_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/interleave_impl.h b/gr-blocks/lib/interleave_impl.h index 46131d164e..76d0bfd6fb 100644 --- a/gr-blocks/lib/interleave_impl.h +++ b/gr-blocks/lib/interleave_impl.h @@ -27,9 +27,9 @@ public: bool check_topology(int ninputs, int noutputs) override; - int fixed_rate_ninput_to_noutput(int ninput); + int fixed_rate_ninput_to_noutput(int ninput) override; - int fixed_rate_noutput_to_ninput(int noutput); + int fixed_rate_noutput_to_ninput(int noutput) override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.h b/gr-blocks/lib/interleaved_char_to_complex_impl.h index 86800782f5..90e72e51b5 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.h @@ -25,7 +25,7 @@ public: interleaved_char_to_complex_impl(bool vector_input = false, float scale_factor = 1.0f); - virtual void set_scale_factor(float new_value) { d_scalar = new_value; }; + void set_scale_factor(float new_value) override { d_scalar = new_value; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h b/gr-blocks/lib/interleaved_short_to_complex_impl.h index dad4268666..80f5b71278 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h @@ -27,9 +27,9 @@ public: bool swap = false, float scale_factor = 1.0f); - void set_swap(bool swap); + void set_swap(bool swap) override; - virtual void set_scale_factor(float new_value) { d_scalar = new_value; }; + void set_scale_factor(float new_value) override { d_scalar = new_value; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index 7d8971d9e6..249e0c2ee1 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -33,9 +33,9 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void set_m(int m); - void set_n(int n); - void set_offset(int offset); + void set_m(int m) override; + void set_n(int n) override; + void set_offset(int offset) override; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/keep_one_in_n_impl.h b/gr-blocks/lib/keep_one_in_n_impl.h index ed2a4db3e4..35fcbec70d 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.h +++ b/gr-blocks/lib/keep_one_in_n_impl.h @@ -31,7 +31,7 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void set_n(int n); + void set_n(int n) override; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.h b/gr-blocks/lib/lfsr_32k_source_s_impl.h index 710cfb27e8..a45eb75492 100644 --- a/gr-blocks/lib/lfsr_32k_source_s_impl.h +++ b/gr-blocks/lib/lfsr_32k_source_s_impl.h @@ -27,7 +27,7 @@ private: public: lfsr_32k_source_s_impl(); - ~lfsr_32k_source_s_impl(); + ~lfsr_32k_source_s_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/max_blk_impl.h b/gr-blocks/lib/max_blk_impl.h index 16d811d560..1b2a544a55 100644 --- a/gr-blocks/lib/max_blk_impl.h +++ b/gr-blocks/lib/max_blk_impl.h @@ -25,7 +25,7 @@ private: public: max_blk_impl(size_t vlen, size_t vlen_out); - ~max_blk_impl(); + ~max_blk_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/message_debug_impl.h b/gr-blocks/lib/message_debug_impl.h index 2d61e18044..c9fc65391c 100644 --- a/gr-blocks/lib/message_debug_impl.h +++ b/gr-blocks/lib/message_debug_impl.h @@ -66,11 +66,11 @@ private: public: message_debug_impl(bool en_uvec); - ~message_debug_impl(); + ~message_debug_impl() override; - int num_messages(); - pmt::pmt_t get_message(int i); - void set_vector_print(bool en) { d_en_uvec = en; }; + int num_messages() override; + pmt::pmt_t get_message(int i) override; + void set_vector_print(bool en) override { d_en_uvec = en; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/message_strobe_impl.h b/gr-blocks/lib/message_strobe_impl.h index f378054813..9b656909bd 100644 --- a/gr-blocks/lib/message_strobe_impl.h +++ b/gr-blocks/lib/message_strobe_impl.h @@ -30,17 +30,17 @@ private: public: message_strobe_impl(pmt::pmt_t msg, long period_ms); - ~message_strobe_impl(); + ~message_strobe_impl() override; - void set_msg(pmt::pmt_t msg) { d_msg = msg; } - pmt::pmt_t msg() const { return d_msg; } - void set_period(long period_ms) { d_period_ms = period_ms; } - long period() const { return d_period_ms; } + void set_msg(pmt::pmt_t msg) override { d_msg = msg; } + pmt::pmt_t msg() const override { return d_msg; } + void set_period(long period_ms) override { d_period_ms = period_ms; } + long period() const override { return d_period_ms; } // Overloading these to start and stop the internal thread that // periodically produces the message. - bool start(); - bool stop(); + bool start() override; + bool stop() override; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/message_strobe_random_impl.h b/gr-blocks/lib/message_strobe_random_impl.h index 400ed3a2ac..2781cad7d6 100644 --- a/gr-blocks/lib/message_strobe_random_impl.h +++ b/gr-blocks/lib/message_strobe_random_impl.h @@ -42,16 +42,16 @@ public: message_strobe_random_distribution_t dist, float mean_ms, float std_ms); - ~message_strobe_random_impl(); - - void set_msg(pmt::pmt_t msg) { d_msg = msg; } - pmt::pmt_t msg() const { return d_msg; } - void set_mean(float mean_ms); - float mean() const; - void set_std(float std_ms); - float std() const { return d_std_ms; } - void set_dist(message_strobe_random_distribution_t dist) { d_dist = dist; } - message_strobe_random_distribution_t dist() const { return d_dist; } + ~message_strobe_random_impl() override; + + void set_msg(pmt::pmt_t msg) override { d_msg = msg; } + pmt::pmt_t msg() const override { return d_msg; } + void set_mean(float mean_ms) override; + float mean() const override; + void set_std(float std_ms) override; + float std() const override { return d_std_ms; } + void set_dist(message_strobe_random_distribution_t dist) override { d_dist = dist; } + message_strobe_random_distribution_t dist() const override { return d_dist; } }; } /* namespace blocks */ diff --git a/gr-blocks/lib/min_blk_impl.h b/gr-blocks/lib/min_blk_impl.h index 2a9896bdfc..01483f82dc 100644 --- a/gr-blocks/lib/min_blk_impl.h +++ b/gr-blocks/lib/min_blk_impl.h @@ -25,7 +25,7 @@ private: public: min_blk_impl(size_t vlen, size_t vlen_out); - ~min_blk_impl(); + ~min_blk_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/moving_average_impl.h b/gr-blocks/lib/moving_average_impl.h index 8f3eda86c7..c9b1b9b689 100644 --- a/gr-blocks/lib/moving_average_impl.h +++ b/gr-blocks/lib/moving_average_impl.h @@ -38,15 +38,15 @@ private: public: moving_average_impl(int length, T scale, int max_iter = 4096, unsigned int vlen = 1); - ~moving_average_impl(); + ~moving_average_impl() override; - int length() const { return d_new_length; } - T scale() const { return d_new_scale; } + int length() const override { return d_new_length; } + T scale() const override { return d_new_scale; } unsigned int vlen() const { return d_vlen; } - void set_length_and_scale(int length, T scale); - void set_length(int length); - void set_scale(T scale); + void set_length_and_scale(int length, T scale) override; + void set_length(int length) override; + void set_scale(T scale) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/multiply_by_tag_value_cc_impl.h b/gr-blocks/lib/multiply_by_tag_value_cc_impl.h index d3f96d5d4e..481311c639 100644 --- a/gr-blocks/lib/multiply_by_tag_value_cc_impl.h +++ b/gr-blocks/lib/multiply_by_tag_value_cc_impl.h @@ -25,11 +25,11 @@ private: public: multiply_by_tag_value_cc_impl(const std::string& tag_name, size_t vlen); - ~multiply_by_tag_value_cc_impl(); + ~multiply_by_tag_value_cc_impl() override; - gr_complex k() const; + gr_complex k() const override; - void setup_rpc(); + void setup_rpc() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/multiply_const_impl.h b/gr-blocks/lib/multiply_const_impl.h index bacc412ea2..87bc7e783c 100644 --- a/gr-blocks/lib/multiply_const_impl.h +++ b/gr-blocks/lib/multiply_const_impl.h @@ -26,8 +26,8 @@ class BLOCKS_API multiply_const_impl : public multiply_const<T> public: multiply_const_impl(T k, size_t vlen); - T k() const { return d_k; } - void set_k(T k) { d_k = k; } + T k() const override { return d_k; } + void set_k(T k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/multiply_const_v_impl.h b/gr-blocks/lib/multiply_const_v_impl.h index 7a25a92aad..9c7c870640 100644 --- a/gr-blocks/lib/multiply_const_v_impl.h +++ b/gr-blocks/lib/multiply_const_v_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API multiply_const_v_impl : public multiply_const_v<T> public: multiply_const_v_impl(std::vector<T> k); - std::vector<T> k() const { return d_k; } - void set_k(std::vector<T> k) { d_k = k; } + std::vector<T> k() const override { return d_k; } + void set_k(std::vector<T> k) override { d_k = k; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/multiply_matrix_impl.h b/gr-blocks/lib/multiply_matrix_impl.h index f6036aa25c..4e8855fbb5 100644 --- a/gr-blocks/lib/multiply_matrix_impl.h +++ b/gr-blocks/lib/multiply_matrix_impl.h @@ -30,10 +30,10 @@ private: public: multiply_matrix_impl(std::vector<std::vector<T>> A, gr::block::tag_propagation_policy_t tag_propagation_policy); - ~multiply_matrix_impl(); + ~multiply_matrix_impl() override; - const std::vector<std::vector<T>>& get_A() const { return d_A; }; - bool set_A(const std::vector<std::vector<T>>& new_A); + const std::vector<std::vector<T>>& get_A() const override { return d_A; }; + bool set_A(const std::vector<std::vector<T>>& new_A) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/mute_impl.h b/gr-blocks/lib/mute_impl.h index 0b5e7d4eb4..ba0a9bcbdf 100644 --- a/gr-blocks/lib/mute_impl.h +++ b/gr-blocks/lib/mute_impl.h @@ -25,10 +25,10 @@ private: public: mute_impl(bool mute); - ~mute_impl(); + ~mute_impl() override; - bool mute() const { return d_mute; } - void set_mute(bool mute) { d_mute = mute; } + bool mute() const override { return d_mute; } + void set_mute(bool mute) override { d_mute = mute; } void set_mute_pmt(pmt::pmt_t msg) { set_mute(pmt::to_bool(msg)); } int work(int noutput_items, diff --git a/gr-blocks/lib/nop_impl.h b/gr-blocks/lib/nop_impl.h index 4802a51b47..519d4836a2 100644 --- a/gr-blocks/lib/nop_impl.h +++ b/gr-blocks/lib/nop_impl.h @@ -27,14 +27,14 @@ protected: public: nop_impl(size_t sizeof_stream_item); - ~nop_impl(); + ~nop_impl() override; - void setup_rpc(); + void setup_rpc() override; - int nmsgs_received() const { return d_nmsgs_recvd; } + int nmsgs_received() const override { return d_nmsgs_recvd; } - int ctrlport_test() const { return d_ctrlport_test; } - void set_ctrlport_test(int x) { d_ctrlport_test = x; } + int ctrlport_test() const override { return d_ctrlport_test; } + void set_ctrlport_test(int x) override { d_ctrlport_test = x; } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/null_sink_impl.h b/gr-blocks/lib/null_sink_impl.h index 472423314e..7219dfe2dd 100644 --- a/gr-blocks/lib/null_sink_impl.h +++ b/gr-blocks/lib/null_sink_impl.h @@ -20,7 +20,7 @@ class null_sink_impl : public null_sink { public: null_sink_impl(size_t sizeof_stream_item); - ~null_sink_impl(); + ~null_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/null_source_impl.h b/gr-blocks/lib/null_source_impl.h index d7c0744b06..c296dd7305 100644 --- a/gr-blocks/lib/null_source_impl.h +++ b/gr-blocks/lib/null_source_impl.h @@ -20,7 +20,7 @@ class null_source_impl : public null_source { public: null_source_impl(size_t sizeof_stream_item); - ~null_source_impl(); + ~null_source_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/packed_to_unpacked_impl.h b/gr-blocks/lib/packed_to_unpacked_impl.h index 8e862d3177..b24e11bb93 100644 --- a/gr-blocks/lib/packed_to_unpacked_impl.h +++ b/gr-blocks/lib/packed_to_unpacked_impl.h @@ -31,7 +31,7 @@ private: public: packed_to_unpacked_impl(unsigned int bits_per_chunk, endianness_t endianness); - ~packed_to_unpacked_impl(); + ~packed_to_unpacked_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, @@ -39,7 +39,10 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } + bool check_topology(int ninputs, int noutputs) override + { + return ninputs == noutputs; + } }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_filter_impl.h b/gr-blocks/lib/pdu_filter_impl.h index caefd24bd0..7d3d9e7acd 100644 --- a/gr-blocks/lib/pdu_filter_impl.h +++ b/gr-blocks/lib/pdu_filter_impl.h @@ -26,9 +26,9 @@ private: public: pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert); void handle_msg(pmt::pmt_t msg); - void set_key(pmt::pmt_t key) { d_k = key; }; - void set_val(pmt::pmt_t val) { d_v = val; }; - void set_inversion(bool invert) { d_invert = invert; }; + void set_key(pmt::pmt_t key) override { d_k = key; }; + void set_val(pmt::pmt_t val) override { d_v = val; }; + void set_inversion(bool invert) override { d_invert = invert; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_remove_impl.h b/gr-blocks/lib/pdu_remove_impl.h index aa090f9288..74c77d6e45 100644 --- a/gr-blocks/lib/pdu_remove_impl.h +++ b/gr-blocks/lib/pdu_remove_impl.h @@ -24,7 +24,7 @@ private: public: pdu_remove_impl(pmt::pmt_t k); void handle_msg(pmt::pmt_t msg); - void set_key(pmt::pmt_t key) { d_k = key; }; + void set_key(pmt::pmt_t key) override { d_k = key; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_set_impl.h b/gr-blocks/lib/pdu_set_impl.h index 0c489be3df..fbfae9dd03 100644 --- a/gr-blocks/lib/pdu_set_impl.h +++ b/gr-blocks/lib/pdu_set_impl.h @@ -25,8 +25,8 @@ private: public: pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v); void handle_msg(pmt::pmt_t msg); - void set_key(pmt::pmt_t key) { d_k = key; }; - void set_val(pmt::pmt_t val) { d_v = val; }; + void set_key(pmt::pmt_t key) override { d_k = key; }; + void set_val(pmt::pmt_t val) override { d_v = val; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h index 65b247ef30..0a389fb040 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h @@ -27,7 +27,7 @@ public: pdu_to_tagged_stream_impl(pdu::vector_type type, const std::string& lengthtagname = "packet_len"); - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/peak_detector2_fb_impl.h b/gr-blocks/lib/peak_detector2_fb_impl.h index 62571c0baa..8432d64eaa 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.h +++ b/gr-blocks/lib/peak_detector2_fb_impl.h @@ -31,15 +31,15 @@ private: public: peak_detector2_fb_impl(float threshold_factor_rise, int look_ahead, float alpha); - ~peak_detector2_fb_impl(); + ~peak_detector2_fb_impl() override; - void set_threshold_factor_rise(float thr); - void set_look_ahead(int look); - void set_alpha(float alpha); + void set_threshold_factor_rise(float thr) override; + void set_look_ahead(int look) override; + void set_alpha(float alpha) override; - float threshold_factor_rise() { return d_threshold_factor_rise; } - int look_ahead() { return d_look_ahead; } - float alpha() { return d_alpha; } + float threshold_factor_rise() override { return d_threshold_factor_rise; } + int look_ahead() override { return d_look_ahead; } + float alpha() override { return d_alpha; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/peak_detector_impl.h b/gr-blocks/lib/peak_detector_impl.h index 4aa792654f..8ca9522570 100644 --- a/gr-blocks/lib/peak_detector_impl.h +++ b/gr-blocks/lib/peak_detector_impl.h @@ -31,16 +31,16 @@ public: float threshold_factor_fall, int look_ahead, float alpha); - ~peak_detector_impl(); - - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(float alpha) { d_avg_alpha = alpha; } - float threshold_factor_rise() { return d_threshold_factor_rise; } - float threshold_factor_fall() { return d_threshold_factor_fall; } - int look_ahead() { return d_look_ahead; } - float alpha() { return d_avg_alpha; } + ~peak_detector_impl() override; + + void set_threshold_factor_rise(float thr) override { d_threshold_factor_rise = thr; } + void set_threshold_factor_fall(float thr) override { d_threshold_factor_fall = thr; } + void set_look_ahead(int look) override { d_look_ahead = look; } + void set_alpha(float alpha) override { d_avg_alpha = alpha; } + float threshold_factor_rise() override { return d_threshold_factor_rise; } + float threshold_factor_fall() override { return d_threshold_factor_fall; } + int look_ahead() override { return d_look_ahead; } + float alpha() override { return d_avg_alpha; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/phase_shift_impl.h b/gr-blocks/lib/phase_shift_impl.h index d2a4b96b97..aa1ac253d6 100644 --- a/gr-blocks/lib/phase_shift_impl.h +++ b/gr-blocks/lib/phase_shift_impl.h @@ -25,10 +25,10 @@ private: public: phase_shift_impl(float shift, bool is_radians); - ~phase_shift_impl(); + ~phase_shift_impl() override; - virtual float get_shift() const { return d_shift; } - virtual void set_shift(float new_value); + float get_shift() const override { return d_shift; } + void set_shift(float new_value) override; void handle_msg_in(pmt::pmt_t msg); diff --git a/gr-blocks/lib/plateau_detector_fb_impl.h b/gr-blocks/lib/plateau_detector_fb_impl.h index d0246f0b93..f2630ac8c5 100644 --- a/gr-blocks/lib/plateau_detector_fb_impl.h +++ b/gr-blocks/lib/plateau_detector_fb_impl.h @@ -24,7 +24,7 @@ private: public: plateau_detector_fb_impl(int max_len, float threshold); - ~plateau_detector_fb_impl(); + ~plateau_detector_fb_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; @@ -33,8 +33,8 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - virtual void set_threshold(float threshold); - virtual float threshold() const; + void set_threshold(float threshold) override; + float threshold() const override; }; } // namespace blocks diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h index a269f92aea..473afb1f5d 100644 --- a/gr-blocks/lib/probe_rate_impl.h +++ b/gr-blocks/lib/probe_rate_impl.h @@ -23,19 +23,19 @@ private: const double d_min_update_time; boost::posix_time::ptime d_last_update; uint64_t d_lastthru; - void setup_rpc(); + void setup_rpc() override; const pmt::pmt_t d_port; const pmt::pmt_t d_dict_avg, d_dict_now; public: probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha = 0.0001); - ~probe_rate_impl(); - void set_alpha(double alpha); - double rate(); + ~probe_rate_impl() override; + void set_alpha(double alpha) override; + double rate() override; double timesincelast(); - bool start(); - bool stop(); + bool start() override; + bool stop() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/probe_signal_impl.h b/gr-blocks/lib/probe_signal_impl.h index 5297f73a5d..cc52a7c4ba 100644 --- a/gr-blocks/lib/probe_signal_impl.h +++ b/gr-blocks/lib/probe_signal_impl.h @@ -25,9 +25,9 @@ private: public: probe_signal_impl(); - ~probe_signal_impl(); + ~probe_signal_impl() override; - T level() const { return d_level; } + T level() const override { return d_level; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/probe_signal_v_impl.h b/gr-blocks/lib/probe_signal_v_impl.h index 4e6e09ecb7..ee1dc217f8 100644 --- a/gr-blocks/lib/probe_signal_v_impl.h +++ b/gr-blocks/lib/probe_signal_v_impl.h @@ -26,9 +26,9 @@ private: public: probe_signal_v_impl(size_t size); - ~probe_signal_v_impl(); + ~probe_signal_v_impl() override; - std::vector<T> level() const { return d_level; } + std::vector<T> level() const override { return d_level; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc index 596d0d14c7..e739b73d26 100644 --- a/gr-blocks/lib/qa_gr_flowgraph.cc +++ b/gr-blocks/lib/qa_gr_flowgraph.cc @@ -35,11 +35,11 @@ public: io_signature::make(1, 1, sizeof_stream_item)) { } - ~null_source_qa_impl() {} + ~null_source_qa_impl() override {} 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 { void* optr; for (size_t n = 0; n < input_items.size(); n++) { @@ -68,10 +68,10 @@ public: io_signature::make(0, 0, 0)) { } - ~null_sink_qa_impl() {} + ~null_sink_qa_impl() override {} 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 { return noutput_items; } diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc index a1a0ede624..fcab6e5bfa 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc @@ -35,7 +35,7 @@ private: gr_derived_block(); public: - ~gr_derived_block(); + ~gr_derived_block() override; }; diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h index eef29df1c3..7f0b87c90c 100644 --- a/gr-blocks/lib/random_pdu_impl.h +++ b/gr-blocks/lib/random_pdu_impl.h @@ -34,7 +34,7 @@ public: unsigned char byte_mask, int length_modulo); - bool start(); + bool start() override; void output_random(); void generate_pdu(pmt::pmt_t msg) { output_random(); } void generate_pdu() { output_random(); } diff --git a/gr-blocks/lib/regenerate_bb_impl.h b/gr-blocks/lib/regenerate_bb_impl.h index 8a50f91722..18071944a9 100644 --- a/gr-blocks/lib/regenerate_bb_impl.h +++ b/gr-blocks/lib/regenerate_bb_impl.h @@ -26,13 +26,13 @@ private: public: regenerate_bb_impl(int period, unsigned int max_regen = 500); - ~regenerate_bb_impl(); + ~regenerate_bb_impl() override; - void set_max_regen(unsigned int regen); - void set_period(int period); + void set_max_regen(unsigned int regen) override; + void set_period(int period) override; - unsigned int max_regen() const { return d_max_regen; }; - int period() const { return d_period; }; + unsigned int max_regen() const override { return d_max_regen; }; + int period() const override { return d_period; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/repack_bits_bb_impl.h b/gr-blocks/lib/repack_bits_bb_impl.h index b73acb5a55..b4019af37c 100644 --- a/gr-blocks/lib/repack_bits_bb_impl.h +++ b/gr-blocks/lib/repack_bits_bb_impl.h @@ -29,7 +29,7 @@ private: const endianness_t d_endianness; protected: - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; public: repack_bits_bb_impl(int k, @@ -37,10 +37,10 @@ public: const std::string& len_tag_key, bool align_output, endianness_t endianness = GR_LSB_FIRST); - ~repack_bits_bb_impl(); - void set_k_and_l( - int k, - int l); // callback function for bits per input byte k and bits per output byte l + ~repack_bits_bb_impl() override; + void set_k_and_l(int k, + int l) override; // callback function for bits per input byte k and + // bits per output byte l int work(int noutput_items, gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/repeat_impl.h b/gr-blocks/lib/repeat_impl.h index 4f15872f70..4151e9df84 100644 --- a/gr-blocks/lib/repeat_impl.h +++ b/gr-blocks/lib/repeat_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API repeat_impl : public repeat public: repeat_impl(size_t itemsize, int d_interp); - int interpolation() const { return d_interp; } - void set_interpolation(int interp); + int interpolation() const override { return d_interp; } + void set_interpolation(int interp) override; int work(int noutput_items, diff --git a/gr-blocks/lib/rms_cf_impl.h b/gr-blocks/lib/rms_cf_impl.h index 6e63e40c28..83a96b4ab6 100644 --- a/gr-blocks/lib/rms_cf_impl.h +++ b/gr-blocks/lib/rms_cf_impl.h @@ -27,9 +27,9 @@ private: public: rms_cf_impl(double alpha = 0.0001); - ~rms_cf_impl(); + ~rms_cf_impl() override; - void set_alpha(double alpha); + void set_alpha(double alpha) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/rms_ff_impl.h b/gr-blocks/lib/rms_ff_impl.h index 8ee3927d31..2e3311c324 100644 --- a/gr-blocks/lib/rms_ff_impl.h +++ b/gr-blocks/lib/rms_ff_impl.h @@ -27,9 +27,9 @@ private: public: rms_ff_impl(double alpha = 0.0001); - ~rms_ff_impl(); + ~rms_ff_impl() override; - void set_alpha(double alpha); + void set_alpha(double alpha) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/rotator_cc_impl.h b/gr-blocks/lib/rotator_cc_impl.h index f31d484063..c1001d11b3 100644 --- a/gr-blocks/lib/rotator_cc_impl.h +++ b/gr-blocks/lib/rotator_cc_impl.h @@ -28,9 +28,9 @@ private: public: rotator_cc_impl(double phase_inc = 0.0); - ~rotator_cc_impl(); + ~rotator_cc_impl() override; - void set_phase_inc(double phase_inc); + void set_phase_inc(double phase_inc) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/sample_and_hold_impl.h b/gr-blocks/lib/sample_and_hold_impl.h index f2db7b15bc..9ed3929254 100644 --- a/gr-blocks/lib/sample_and_hold_impl.h +++ b/gr-blocks/lib/sample_and_hold_impl.h @@ -25,7 +25,7 @@ private: public: sample_and_hold_impl(); - ~sample_and_hold_impl(); + ~sample_and_hold_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/selector_impl.h b/gr-blocks/lib/selector_impl.h index 6bbf71697a..90ff0a990f 100644 --- a/gr-blocks/lib/selector_impl.h +++ b/gr-blocks/lib/selector_impl.h @@ -30,26 +30,26 @@ private: public: selector_impl(size_t itemsize, unsigned int input_index, unsigned int output_index); - ~selector_impl(); + ~selector_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; bool check_topology(int ninputs, int noutputs) override; - void setup_rpc(); + void setup_rpc() override; void handle_msg_input_index(pmt::pmt_t msg); void handle_msg_output_index(pmt::pmt_t msg); void handle_enable(pmt::pmt_t msg); - void set_enabled(bool enable) + void set_enabled(bool enable) override { gr::thread::scoped_lock l(d_mutex); d_enabled = enable; } - bool enabled() const { return d_enabled; } + bool enabled() const override { return d_enabled; } - void set_input_index(unsigned int input_index); - int input_index() const { return d_input_index; } + void set_input_index(unsigned int input_index) override; + int input_index() const override { return d_input_index; } - void set_output_index(unsigned int output_index); - int output_index() const { return d_output_index; } + void set_output_index(unsigned int output_index) override; + int output_index() const override { return d_output_index; } int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/short_to_float_impl.h b/gr-blocks/lib/short_to_float_impl.h index 4536fa2cb9..d2a11ab14d 100644 --- a/gr-blocks/lib/short_to_float_impl.h +++ b/gr-blocks/lib/short_to_float_impl.h @@ -24,8 +24,8 @@ class BLOCKS_API short_to_float_impl : public short_to_float public: short_to_float_impl(size_t vlen, float scale); - virtual float scale() const { return d_scale; } - virtual void set_scale(float scale) { d_scale = scale; } + float scale() const override { return d_scale; } + void set_scale(float scale) override { d_scale = scale; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/skiphead_impl.h b/gr-blocks/lib/skiphead_impl.h index 4ac4a14ea0..aec234cbde 100644 --- a/gr-blocks/lib/skiphead_impl.h +++ b/gr-blocks/lib/skiphead_impl.h @@ -25,7 +25,7 @@ private: public: skiphead_impl(size_t itemsize, uint64_t nitems_to_skip); - ~skiphead_impl(); + ~skiphead_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index 2e6c935471..d885c665c4 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -58,8 +58,8 @@ public: std::string port, int MTU = 10000, bool tcp_no_delay = false); - ~socket_pdu_impl(); - bool stop(); + ~socket_pdu_impl() override; + bool stop() override; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.h b/gr-blocks/lib/stream_to_tagged_stream_impl.h index b72d2b8e85..acdf63a364 100644 --- a/gr-blocks/lib/stream_to_tagged_stream_impl.h +++ b/gr-blocks/lib/stream_to_tagged_stream_impl.h @@ -30,15 +30,15 @@ public: unsigned int vlen, unsigned packet_len, const std::string& tag_len_key); - ~stream_to_tagged_stream_impl(); - void set_packet_len(unsigned packet_len); - void set_packet_len_pmt(unsigned packet_len); + ~stream_to_tagged_stream_impl() override; + void set_packet_len(unsigned packet_len) override; + void set_packet_len_pmt(unsigned packet_len) override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool start(); + bool start() override; }; } // namespace blocks diff --git a/gr-blocks/lib/stretch_ff_impl.h b/gr-blocks/lib/stretch_ff_impl.h index a4b695c24d..63cef9db67 100644 --- a/gr-blocks/lib/stretch_ff_impl.h +++ b/gr-blocks/lib/stretch_ff_impl.h @@ -24,11 +24,11 @@ private: public: stretch_ff_impl(float lo, size_t vlen); - ~stretch_ff_impl(); + ~stretch_ff_impl() override; - float lo() const { return d_lo; } - void set_lo(float lo) { d_lo = lo; } - size_t vlen() const { return d_vlen; } + float lo() const override { return d_lo; } + void set_lo(float lo) override { d_lo = lo; } + size_t vlen() const override { return d_vlen; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/tag_debug_impl.h b/gr-blocks/lib/tag_debug_impl.h index 8e229af8ce..3a55f455d5 100644 --- a/gr-blocks/lib/tag_debug_impl.h +++ b/gr-blocks/lib/tag_debug_impl.h @@ -33,19 +33,19 @@ public: tag_debug_impl(size_t sizeof_stream_item, const std::string& name, const std::string& key_filter = ""); - ~tag_debug_impl(); + ~tag_debug_impl() override; - void setup_rpc(); + void setup_rpc() override; - std::vector<tag_t> current_tags(); - int num_tags(); + std::vector<tag_t> current_tags() override; + int num_tags() override; - void set_display(bool d); + void set_display(bool d) override; - void set_save_all(bool s); + void set_save_all(bool s) override; - void set_key_filter(const std::string& key_filter); - std::string key_filter() const; + void set_key_filter(const std::string& key_filter) override; + std::string key_filter() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/tag_gate_impl.h b/gr-blocks/lib/tag_gate_impl.h index 5d1fa9a8f9..8e067a94d5 100644 --- a/gr-blocks/lib/tag_gate_impl.h +++ b/gr-blocks/lib/tag_gate_impl.h @@ -27,16 +27,16 @@ private: public: tag_gate_impl(size_t item_size, bool propagate_tags); - ~tag_gate_impl(); + ~tag_gate_impl() override; - void set_propagation(bool propagate_tags); + void set_propagation(bool propagate_tags) override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void set_single_key(const std::string& single_key); - std::string single_key() const; + void set_single_key(const std::string& single_key) override; + std::string single_key() const override; }; } // namespace blocks diff --git a/gr-blocks/lib/tag_share_impl.h b/gr-blocks/lib/tag_share_impl.h index 8b9833c6bd..83ccd3e763 100644 --- a/gr-blocks/lib/tag_share_impl.h +++ b/gr-blocks/lib/tag_share_impl.h @@ -24,7 +24,7 @@ private: public: tag_share_impl(size_t sizeof_io_item, size_t sizeof_share_item, size_t vlen); - ~tag_share_impl(); + ~tag_share_impl() override; // Where all the action really happens int work(int noutput_items, diff --git a/gr-blocks/lib/tagged_file_sink_impl.h b/gr-blocks/lib/tagged_file_sink_impl.h index f86f0f0cc9..825a00e101 100644 --- a/gr-blocks/lib/tagged_file_sink_impl.h +++ b/gr-blocks/lib/tagged_file_sink_impl.h @@ -32,7 +32,7 @@ private: public: tagged_file_sink_impl(size_t itemsize, double samp_rate); - ~tagged_file_sink_impl(); + ~tagged_file_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/tagged_stream_align_impl.h b/gr-blocks/lib/tagged_stream_align_impl.h index 000a5c02e5..2a521b056e 100644 --- a/gr-blocks/lib/tagged_stream_align_impl.h +++ b/gr-blocks/lib/tagged_stream_align_impl.h @@ -26,7 +26,7 @@ private: public: tagged_stream_align_impl(size_t itemsize, const std::string& lengthtagname); - ~tagged_stream_align_impl(); + ~tagged_stream_align_impl() override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.h b/gr-blocks/lib/tagged_stream_multiply_length_impl.h index c0e9f02c9f..f1729c2aea 100644 --- a/gr-blocks/lib/tagged_stream_multiply_length_impl.h +++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.h @@ -28,14 +28,14 @@ public: tagged_stream_multiply_length_impl(size_t itemsize, const std::string& lengthtagname, double scalar); - ~tagged_stream_multiply_length_impl(); + ~tagged_stream_multiply_length_impl() 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) override; - void set_scalar(double scalar) { d_scalar = scalar; } + void set_scalar(double scalar) override { d_scalar = scalar; } void set_scalar_pmt(pmt::pmt_t msg) { set_scalar(pmt::to_double(msg)); } }; diff --git a/gr-blocks/lib/tagged_stream_mux_impl.h b/gr-blocks/lib/tagged_stream_mux_impl.h index 36fa904ae2..730be522c6 100644 --- a/gr-blocks/lib/tagged_stream_mux_impl.h +++ b/gr-blocks/lib/tagged_stream_mux_impl.h @@ -24,13 +24,13 @@ private: const unsigned int d_tag_preserve_head_pos; protected: - int calculate_output_stream_length(const gr_vector_int& ninput_items); + int calculate_output_stream_length(const gr_vector_int& ninput_items) override; public: tagged_stream_mux_impl(size_t itemsize, const std::string& lengthtagname, unsigned int d_tag_preserve_head_pos); - ~tagged_stream_mux_impl(); + ~tagged_stream_mux_impl() override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/tags_strobe_impl.h b/gr-blocks/lib/tags_strobe_impl.h index 1c35ef01b0..07631a2365 100644 --- a/gr-blocks/lib/tags_strobe_impl.h +++ b/gr-blocks/lib/tags_strobe_impl.h @@ -31,14 +31,14 @@ public: pmt::pmt_t value, uint64_t nsamps, pmt::pmt_t key); - ~tags_strobe_impl(); - - void set_value(pmt::pmt_t value); - void set_key(pmt::pmt_t key); - pmt::pmt_t value() const { return d_tag.value; } - pmt::pmt_t key() const { return d_tag.key; } - void set_nsamps(uint64_t nsamps); - uint64_t nsamps() const { return d_nsamps; } + ~tags_strobe_impl() override; + + void set_value(pmt::pmt_t value) override; + void set_key(pmt::pmt_t key) override; + pmt::pmt_t value() const override { return d_tag.value; } + pmt::pmt_t key() const override { return d_tag.key; } + void set_nsamps(uint64_t nsamps) override; + uint64_t nsamps() const override { return d_nsamps; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h index c7740a9a28..b7ff7af174 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.h +++ b/gr-blocks/lib/tcp_server_sink_impl.h @@ -50,7 +50,7 @@ public: const std::string& host, int port, bool noblock); - ~tcp_server_sink_impl(); + ~tcp_server_sink_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/test_tag_variable_rate_ff_impl.h b/gr-blocks/lib/test_tag_variable_rate_ff_impl.h index cea29df9d9..ebce42dd42 100644 --- a/gr-blocks/lib/test_tag_variable_rate_ff_impl.h +++ b/gr-blocks/lib/test_tag_variable_rate_ff_impl.h @@ -28,7 +28,7 @@ protected: public: test_tag_variable_rate_ff_impl(bool update_once = false, double update_step = 0.001); - ~test_tag_variable_rate_ff_impl(); + ~test_tag_variable_rate_ff_impl() override; // void setup_rpc(); diff --git a/gr-blocks/lib/threshold_ff_impl.h b/gr-blocks/lib/threshold_ff_impl.h index 74c2f4c2bb..53b480971a 100644 --- a/gr-blocks/lib/threshold_ff_impl.h +++ b/gr-blocks/lib/threshold_ff_impl.h @@ -24,14 +24,14 @@ private: public: threshold_ff_impl(float lo, float hi, float initial_state = 0); - ~threshold_ff_impl(); - - float lo() const { return d_lo; } - void set_lo(float lo) { d_lo = lo; } - float hi() const { return d_hi; } - void set_hi(float hi) { d_hi = hi; } - float last_state() const { return d_last_state; } - void set_last_state(float last_state) { d_last_state = last_state; } + ~threshold_ff_impl() override; + + float lo() const override { return d_lo; } + void set_lo(float lo) override { d_lo = lo; } + float hi() const override { return d_hi; } + void set_hi(float hi) override { d_hi = hi; } + float last_state() const override { return d_last_state; } + void set_last_state(float last_state) override { d_last_state = last_state; } int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/throttle_impl.h b/gr-blocks/lib/throttle_impl.h index c752f419fa..4a75dcbfa3 100644 --- a/gr-blocks/lib/throttle_impl.h +++ b/gr-blocks/lib/throttle_impl.h @@ -29,15 +29,15 @@ private: public: throttle_impl(size_t itemsize, double samples_per_sec, bool ignore_tags = true); - ~throttle_impl(); + ~throttle_impl() override; // Overloading gr::block::start to reset timer - bool start(); + bool start() override; - void setup_rpc(); + void setup_rpc() override; - void set_sample_rate(double rate); - double sample_rate() const; + void set_sample_rate(double rate) override; + double sample_rate() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/transcendental_impl.h b/gr-blocks/lib/transcendental_impl.h index 087431f5f6..b2efc54d3f 100644 --- a/gr-blocks/lib/transcendental_impl.h +++ b/gr-blocks/lib/transcendental_impl.h @@ -25,7 +25,7 @@ private: public: transcendental_impl(const work_fcn_type& work_fcn, const size_t io_size); - ~transcendental_impl(); + ~transcendental_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/tsb_vector_sink_impl.h b/gr-blocks/lib/tsb_vector_sink_impl.h index aeaa8ce88c..33fd9cafbf 100644 --- a/gr-blocks/lib/tsb_vector_sink_impl.h +++ b/gr-blocks/lib/tsb_vector_sink_impl.h @@ -27,11 +27,11 @@ private: public: tsb_vector_sink_impl(unsigned int vlen, const std::string& tsb_key); - ~tsb_vector_sink_impl(); + ~tsb_vector_sink_impl() override; - void reset() { d_data.clear(); } - std::vector<std::vector<T>> data() const; - std::vector<tag_t> tags() const; + void reset() override { d_data.clear(); } + std::vector<std::vector<T>> data() const override; + std::vector<tag_t> tags() const override; int work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-blocks/lib/udp_sink_impl.h b/gr-blocks/lib/udp_sink_impl.h index d92d9b5bec..0912a8a6dc 100644 --- a/gr-blocks/lib/udp_sink_impl.h +++ b/gr-blocks/lib/udp_sink_impl.h @@ -35,12 +35,12 @@ private: public: udp_sink_impl( size_t itemsize, const std::string& host, int port, int payload_size, bool eof); - ~udp_sink_impl(); + ~udp_sink_impl() override; - int payload_size() { return d_payload_size; } + int payload_size() override { return d_payload_size; } - void connect(const std::string& host, int port); - void disconnect(); + void connect(const std::string& host, int port) override; + void disconnect() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h index 0e3053ab71..608b44504a 100644 --- a/gr-blocks/lib/udp_source_impl.h +++ b/gr-blocks/lib/udp_source_impl.h @@ -54,13 +54,13 @@ private: public: udp_source_impl( size_t itemsize, const std::string& host, int port, int payload_size, bool eof); - ~udp_source_impl(); + ~udp_source_impl() override; - void connect(const std::string& host, int port); - void disconnect(); + void connect(const std::string& host, int port) override; + void disconnect() override; - int payload_size() { return d_payload_size; } - int get_port(); + int payload_size() override { return d_payload_size; } + int get_port() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/unpacked_to_packed_impl.h b/gr-blocks/lib/unpacked_to_packed_impl.h index a21f38ae8e..a4d8b024b7 100644 --- a/gr-blocks/lib/unpacked_to_packed_impl.h +++ b/gr-blocks/lib/unpacked_to_packed_impl.h @@ -30,7 +30,7 @@ private: public: unpacked_to_packed_impl(unsigned int bits_per_chunk, endianness_t endianness); - ~unpacked_to_packed_impl(); + ~unpacked_to_packed_impl() override; void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; int general_work(int noutput_items, @@ -38,7 +38,10 @@ public: gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } + bool check_topology(int ninputs, int noutputs) override + { + return ninputs == noutputs; + } }; } /* namespace blocks */ diff --git a/gr-blocks/lib/vco_c_impl.h b/gr-blocks/lib/vco_c_impl.h index b92c5c01d2..75ae26622a 100644 --- a/gr-blocks/lib/vco_c_impl.h +++ b/gr-blocks/lib/vco_c_impl.h @@ -28,7 +28,7 @@ private: public: vco_c_impl(double sampling_rate, double sensitivity, double amplitude); - ~vco_c_impl(); + ~vco_c_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/vco_f_impl.h b/gr-blocks/lib/vco_f_impl.h index 10b875bd16..c7e14bada5 100644 --- a/gr-blocks/lib/vco_f_impl.h +++ b/gr-blocks/lib/vco_f_impl.h @@ -28,7 +28,7 @@ private: public: vco_f_impl(double sampling_rate, double sensitivity, double amplitude); - ~vco_f_impl(); + ~vco_f_impl() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/vector_insert_impl.h b/gr-blocks/lib/vector_insert_impl.h index ef41a305bd..b15f977a96 100644 --- a/gr-blocks/lib/vector_insert_impl.h +++ b/gr-blocks/lib/vector_insert_impl.h @@ -27,10 +27,10 @@ private: public: vector_insert_impl(const std::vector<T>& data, int periodicity, int offset); - ~vector_insert_impl(); + ~vector_insert_impl() override; - void rewind() { d_offset = 0; } - void set_data(const std::vector<T>& data) + void rewind() override { d_offset = 0; } + void set_data(const std::vector<T>& data) override { d_data = data; rewind(); diff --git a/gr-blocks/lib/vector_map_impl.h b/gr-blocks/lib/vector_map_impl.h index 3078f0a5d8..21d1b967b3 100644 --- a/gr-blocks/lib/vector_map_impl.h +++ b/gr-blocks/lib/vector_map_impl.h @@ -29,9 +29,9 @@ public: vector_map_impl(size_t item_size, std::vector<size_t> in_vlens, std::vector<std::vector<std::vector<size_t>>> mapping); - ~vector_map_impl(); + ~vector_map_impl() override; - void set_mapping(std::vector<std::vector<std::vector<size_t>>> mapping); + void set_mapping(std::vector<std::vector<std::vector<size_t>>> mapping) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/vector_sink_impl.h b/gr-blocks/lib/vector_sink_impl.h index 1392ca2bff..b1d6afd6d6 100644 --- a/gr-blocks/lib/vector_sink_impl.h +++ b/gr-blocks/lib/vector_sink_impl.h @@ -29,11 +29,11 @@ private: public: vector_sink_impl(unsigned int vlen, const int reserve_items); - ~vector_sink_impl(); + ~vector_sink_impl() override; - void reset(); - std::vector<T> data() const; - std::vector<tag_t> tags() const; + void reset() override; + std::vector<T> data() const override; + std::vector<tag_t> tags() const override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/vector_source_impl.h b/gr-blocks/lib/vector_source_impl.h index a4710e2b36..852ef1a5d8 100644 --- a/gr-blocks/lib/vector_source_impl.h +++ b/gr-blocks/lib/vector_source_impl.h @@ -33,11 +33,11 @@ public: bool repeat, unsigned int vlen, const std::vector<tag_t>& tags); - ~vector_source_impl(); + ~vector_source_impl() override; - void rewind() { d_offset = 0; } - void set_data(const std::vector<T>& data, const std::vector<tag_t>& tags); - void set_repeat(bool repeat) { d_repeat = repeat; }; + void rewind() override { d_offset = 0; } + void set_data(const std::vector<T>& data, const std::vector<tag_t>& tags) override; + void set_repeat(bool repeat) override { d_repeat = repeat; }; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/wavfile_sink_impl.h b/gr-blocks/lib/wavfile_sink_impl.h index af5f205e22..957c5a40da 100644 --- a/gr-blocks/lib/wavfile_sink_impl.h +++ b/gr-blocks/lib/wavfile_sink_impl.h @@ -60,7 +60,7 @@ private: void close_wav(); protected: - bool stop(); + bool stop() override; public: wavfile_sink_impl(const char* filename, @@ -69,13 +69,13 @@ public: wavfile_format_t format, wavfile_subformat_t subformat, bool append); - ~wavfile_sink_impl(); + ~wavfile_sink_impl() override; - bool open(const char* filename); - void close(); + bool open(const char* filename) override; + void close() override; - void set_sample_rate(unsigned int sample_rate); - void set_bits_per_sample(int bits_per_sample); + void set_sample_rate(unsigned int sample_rate) override; + void set_bits_per_sample(int bits_per_sample) override; void set_append(bool append) override; int bits_per_sample(); diff --git a/gr-blocks/lib/wavfile_source_impl.h b/gr-blocks/lib/wavfile_source_impl.h index f05f0354cd..2258ed2011 100644 --- a/gr-blocks/lib/wavfile_source_impl.h +++ b/gr-blocks/lib/wavfile_source_impl.h @@ -33,13 +33,13 @@ private: public: wavfile_source_impl(const char* filename, bool repeat); - ~wavfile_source_impl(); + ~wavfile_source_impl() override; - unsigned int sample_rate() const { return d_h.sample_rate; }; + unsigned int sample_rate() const override { return d_h.sample_rate; }; - int bits_per_sample() const { return d_h.bytes_per_sample * 8; }; + int bits_per_sample() const override { return d_h.bytes_per_sample * 8; }; - int channels() const { return d_h.nchans; }; + int channels() const override { return d_h.nchans; }; int work(int noutput_items, gr_vector_const_void_star& input_items, |