diff options
Diffstat (limited to 'gnuradio-runtime/include/gnuradio')
15 files changed, 80 insertions, 74 deletions
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h index 47d939a5bc..300187af6a 100644 --- a/gnuradio-runtime/include/gnuradio/basic_block.h +++ b/gnuradio-runtime/include/gnuradio/basic_block.h @@ -131,7 +131,7 @@ protected: public: pmt::pmt_t message_subscribers(pmt::pmt_t port); - virtual ~basic_block(); + ~basic_block() override; long unique_id() const { return d_unique_id; } long symbolic_id() const { return d_symbolic_id; } diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h index be52d996c0..0e25509d00 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h @@ -76,7 +76,7 @@ public: application-specific forwarding behaviour. */ }; - virtual ~block(); + ~block() override; /*! * Assume block computes y_i = f(x_i, x_i-1, x_i-2, x_i-3...) @@ -663,17 +663,17 @@ public: * * \param mask a vector of ints of the core numbers available to this block. */ - void set_processor_affinity(const std::vector<int>& mask); + void set_processor_affinity(const std::vector<int>& mask) override; /*! * \brief Remove processor affinity to a specific core. */ - void unset_processor_affinity(); + void unset_processor_affinity() override; /*! * \brief Get the current processor affinity. */ - std::vector<int> processor_affinity() { return d_affinity; } + std::vector<int> processor_affinity() override { return d_affinity; } /*! * \brief Get the current thread priority in use @@ -716,12 +716,12 @@ public: * \li fatal * \li emerg */ - void set_log_level(std::string level); + void set_log_level(std::string level) override; /*! * \brief Get the logger's output level */ - std::string log_level(); + std::string log_level() override; /*! * \brief returns true when execution has completed due to a message connection diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index f995b12ab5..0973c7bac3 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -112,8 +112,8 @@ public: std::string& handler_name) = 0; protected: - virtual bool has_msg_handler(pmt::pmt_t which_port) = 0; - virtual void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg) = 0; + bool has_msg_handler(pmt::pmt_t which_port) override = 0; + void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg) override = 0; }; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h index fc81796a78..f79f4ef01f 100644 --- a/gnuradio-runtime/include/gnuradio/hier_block2.h +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h @@ -53,7 +53,7 @@ protected: gr::io_signature::sptr output_signature); public: - virtual ~hier_block2(); + ~hier_block2() override; /*! * \brief typedef for object returned from self(). @@ -203,22 +203,22 @@ public: hier_block2_sptr to_hier_block2(); // Needed for Python type coercion - bool has_msg_port(pmt::pmt_t which_port) + bool has_msg_port(pmt::pmt_t which_port) override { return message_port_is_hier(which_port) || basic_block::has_msg_port(which_port); } - bool message_port_is_hier(pmt::pmt_t port_id) + bool message_port_is_hier(pmt::pmt_t port_id) override { return message_port_is_hier_in(port_id) || message_port_is_hier_out(port_id); } - bool message_port_is_hier_in(pmt::pmt_t port_id) + bool message_port_is_hier_in(pmt::pmt_t port_id) override { return pmt::list_has(hier_message_ports_in, port_id); } - bool message_port_is_hier_out(pmt::pmt_t port_id) + bool message_port_is_hier_out(pmt::pmt_t port_id) override { return pmt::list_has(hier_message_ports_out, port_id); } @@ -253,12 +253,12 @@ public: * * \param mask a vector of ints of the core numbers available to this block. */ - void set_processor_affinity(const std::vector<int>& mask); + void set_processor_affinity(const std::vector<int>& mask) override; /*! * \brief Remove processor affinity for all blocks in hier_block2. */ - void unset_processor_affinity(); + void unset_processor_affinity() override; /*! * \brief Get the current processor affinity. @@ -269,7 +269,7 @@ public: * interface. If any block has been individually set, then this * call could be misleading. */ - std::vector<int> processor_affinity(); + std::vector<int> processor_affinity() override; /*! * \brief Set the logger's output level. @@ -289,12 +289,12 @@ public: * \li fatal * \li emerg */ - void set_log_level(std::string level); + void set_log_level(std::string level) override; /*! * \brief Get the logger's output level */ - std::string log_level(); + std::string log_level() override; /*! * \brief Get if all block min buffers should be set. diff --git a/gnuradio-runtime/include/gnuradio/msg_accepter.h b/gnuradio-runtime/include/gnuradio/msg_accepter.h index fb52bf2add..8a0e75d945 100644 --- a/gnuradio-runtime/include/gnuradio/msg_accepter.h +++ b/gnuradio-runtime/include/gnuradio/msg_accepter.h @@ -25,9 +25,9 @@ class GR_RUNTIME_API msg_accepter : public gr::messages::msg_accepter { public: msg_accepter(); - ~msg_accepter(); + ~msg_accepter() override; - void post(pmt::pmt_t which_port, pmt::pmt_t msg); + void post(pmt::pmt_t which_port, pmt::pmt_t msg) override; }; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/msg_queue.h b/gnuradio-runtime/include/gnuradio/msg_queue.h index af1286345e..0d8c4ebeeb 100644 --- a/gnuradio-runtime/include/gnuradio/msg_queue.h +++ b/gnuradio-runtime/include/gnuradio/msg_queue.h @@ -37,10 +37,10 @@ public: static sptr make(unsigned int limit = 0); msg_queue(unsigned int limit); - ~msg_queue(); + ~msg_queue() override; //! Generic msg_handler method: insert the message. - void handle(message::sptr msg) { insert_tail(msg); } + void handle(message::sptr msg) override { insert_tail(msg); } /*! * \brief Insert message at tail of queue. diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h index bb911e462c..ecc314584f 100644 --- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h +++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h @@ -42,9 +42,9 @@ public: { ; } - ~rpcextractor_base() { ; } + ~rpcextractor_base() override { ; } - void post(pmt::pmt_t which_port, pmt::pmt_t msg) + void post(pmt::pmt_t which_port, pmt::pmt_t msg) override { (void)which_port; (void)msg; @@ -62,9 +62,9 @@ class rpcextractor_base<T, void> : public virtual gr::messages::msg_accepter { public: rpcextractor_base(T* source, void (T::*func)()) : _source(source), _func(func) { ; } - ~rpcextractor_base() { ; } + ~rpcextractor_base() override { ; } - void post(pmt::pmt_t which_port, pmt::pmt_t msg) + void post(pmt::pmt_t which_port, pmt::pmt_t msg) override { (void)which_port; (void)msg; @@ -107,7 +107,7 @@ public: rpcinserter_base(T* source, Tfrom (T::*func)()) : _source(source), _func(func) { ; } rpcinserter_base() { ; } - pmt::pmt_t retrieve() + pmt::pmt_t retrieve() override { assert(0); return pmt::pmt_t(); @@ -163,9 +163,12 @@ public: { ; } - ~rpchandler_base() { ; } + ~rpchandler_base() override { ; } - void post(pmt::pmt_t which_port, pmt::pmt_t msg) { _source->post(which_port, msg); } + void post(pmt::pmt_t which_port, pmt::pmt_t msg) override + { + _source->post(which_port, msg); + } protected: T* _source; @@ -899,7 +902,7 @@ struct rpcbasic_register_set : public rpcbasic_base { #endif } - ~rpcbasic_register_set() + ~rpcbasic_register_set() override { #ifdef GR_RPCSERVER_ENABLED rpcmanager::get()->i()->unregisterConfigureCallback(d_id); @@ -1044,7 +1047,7 @@ struct rpcbasic_register_trigger : public rpcbasic_base { #endif } - ~rpcbasic_register_trigger() + ~rpcbasic_register_trigger() override { #ifdef GR_RPCSERVER_ENABLED rpcmanager::get()->i()->unregisterConfigureCallback(d_id); @@ -1319,7 +1322,7 @@ public: #endif } - ~rpcbasic_register_get() + ~rpcbasic_register_get() override { #ifdef GR_RPCSERVER_ENABLED rpcmanager::get()->i()->unregisterQueryCallback(d_id); @@ -1641,7 +1644,7 @@ public: #endif } - ~rpcbasic_register_handler() + ~rpcbasic_register_handler() override { #ifdef GR_RPCSERVER_ENABLED rpcmanager::get()->i()->unregisterHandlerCallback(d_id); diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h index 7c362d8f9b..9a08a03884 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h @@ -20,17 +20,19 @@ class rpcserver_aggregator : public virtual rpcserver_base { public: rpcserver_aggregator(); - virtual ~rpcserver_aggregator(); + ~rpcserver_aggregator() override; void registerConfigureCallback(const std::string& id, - const configureCallback_t callback); - void unregisterConfigureCallback(const std::string& id); + const configureCallback_t callback) override; + void unregisterConfigureCallback(const std::string& id) override; - void registerQueryCallback(const std::string& id, const queryCallback_t callback); - void unregisterQueryCallback(const std::string& id); + void registerQueryCallback(const std::string& id, + const queryCallback_t callback) override; + void unregisterQueryCallback(const std::string& id) override; - void registerHandlerCallback(const std::string& id, const handlerCallback_t callback); - void unregisterHandlerCallback(const std::string& id); + void registerHandlerCallback(const std::string& id, + const handlerCallback_t callback) override; + void unregisterHandlerCallback(const std::string& id) override; void registerServer(rpcmanager_base::rpcserver_booter_base_sptr server); diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_base.h index 57b4e9876b..0747155849 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_base.h @@ -17,19 +17,19 @@ class rpcserver_base : public virtual callbackregister_base { public: rpcserver_base() : cur_priv(RPC_PRIVLVL_ALL) { ; } - virtual ~rpcserver_base() { ; } + ~rpcserver_base() override { ; } - virtual void registerConfigureCallback(const std::string& id, - const configureCallback_t callback) = 0; - virtual void unregisterConfigureCallback(const std::string& id) = 0; + void registerConfigureCallback(const std::string& id, + const configureCallback_t callback) override = 0; + void unregisterConfigureCallback(const std::string& id) override = 0; - virtual void registerQueryCallback(const std::string& id, - const queryCallback_t callback) = 0; - virtual void unregisterQueryCallback(const std::string& id) = 0; + void registerQueryCallback(const std::string& id, + const queryCallback_t callback) override = 0; + void unregisterQueryCallback(const std::string& id) override = 0; - virtual void registerHandlerCallback(const std::string& id, - const handlerCallback_t callback) = 0; - virtual void unregisterHandlerCallback(const std::string& id) = 0; + void registerHandlerCallback(const std::string& id, + const handlerCallback_t callback) override = 0; + void unregisterHandlerCallback(const std::string& id) override = 0; virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; } diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h index 06831ffc27..4e1fa6202b 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h @@ -23,11 +23,11 @@ class GR_RUNTIME_API rpcserver_booter_aggregator : public virtual rpcserver_boot { public: rpcserver_booter_aggregator(); - ~rpcserver_booter_aggregator(); + ~rpcserver_booter_aggregator() override; - rpcserver_base* i(); - const std::string& type(); - const std::vector<std::string> endpoints(); + rpcserver_base* i() override; + const std::string& type() override; + const std::vector<std::string> endpoints() override; const std::vector<std::string>& registeredServers(); diff --git a/gnuradio-runtime/include/gnuradio/sync_block.h b/gnuradio-runtime/include/gnuradio/sync_block.h index a5772f70ec..3275ffdba4 100644 --- a/gnuradio-runtime/include/gnuradio/sync_block.h +++ b/gnuradio-runtime/include/gnuradio/sync_block.h @@ -42,14 +42,14 @@ public: gr_vector_void_star& output_items) = 0; // gr::sync_block overrides these to assist work - 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; - int fixed_rate_ninput_to_noutput(int ninput); - int fixed_rate_noutput_to_ninput(int noutput); + int fixed_rate_ninput_to_noutput(int ninput) override; + int fixed_rate_noutput_to_ninput(int noutput) override; }; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/sync_decimator.h b/gnuradio-runtime/include/gnuradio/sync_decimator.h index 148632cf85..e5c1b2a06f 100644 --- a/gnuradio-runtime/include/gnuradio/sync_decimator.h +++ b/gnuradio-runtime/include/gnuradio/sync_decimator.h @@ -43,16 +43,16 @@ public: } // gr::sync_decimator overrides these to assist work - 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; // derived classes should override work - int fixed_rate_ninput_to_noutput(int ninput); - int fixed_rate_noutput_to_ninput(int noutput); + int fixed_rate_ninput_to_noutput(int ninput) override; + int fixed_rate_noutput_to_ninput(int noutput) override; }; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/sync_interpolator.h b/gnuradio-runtime/include/gnuradio/sync_interpolator.h index c0ae2b339a..f70dc3b22f 100644 --- a/gnuradio-runtime/include/gnuradio/sync_interpolator.h +++ b/gnuradio-runtime/include/gnuradio/sync_interpolator.h @@ -44,16 +44,16 @@ public: } // gr::sync_interpolator overrides these to assist work - 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; // derived classes should override work - int fixed_rate_ninput_to_noutput(int ninput); - int fixed_rate_noutput_to_ninput(int noutput); + int fixed_rate_ninput_to_noutput(int ninput) override; + int fixed_rate_noutput_to_ninput(int noutput) override; }; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/tagged_stream_block.h b/gnuradio-runtime/include/gnuradio/tagged_stream_block.h index ff761efa41..fb691a19f8 100644 --- a/gnuradio-runtime/include/gnuradio/tagged_stream_block.h +++ b/gnuradio-runtime/include/gnuradio/tagged_stream_block.h @@ -86,9 +86,10 @@ protected: public: /*! \brief Don't override this. */ - void /* final */ forecast(int noutput_items, gr_vector_int& ninput_items_required); + void /* final */ forecast(int noutput_items, + gr_vector_int& ninput_items_required) override; - bool check_topology(int ninputs, int /* noutputs */); + bool check_topology(int ninputs, int /* noutputs */) override; /*! * - Reads the number of input items from the tags using parse_length_tags() @@ -100,7 +101,7 @@ public: 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; /*! * \brief Just like gr::block::general_work, but makes sure the input is valid diff --git a/gnuradio-runtime/include/gnuradio/top_block.h b/gnuradio-runtime/include/gnuradio/top_block.h index 12051e6f04..199021c982 100644 --- a/gnuradio-runtime/include/gnuradio/top_block.h +++ b/gnuradio-runtime/include/gnuradio/top_block.h @@ -38,7 +38,7 @@ protected: top_block(const std::string& name, bool catch_exceptions = true); public: - ~top_block(); + ~top_block() override; /*! * \brief The simple interface to running a flowgraph. @@ -92,7 +92,7 @@ public: * thread (E.g., block::work method) or deadlock will occur * when reconfiguration happens. */ - virtual void lock(); + void lock() override; /*! * Unlock a flowgraph in preparation for reconfiguration. When an @@ -103,7 +103,7 @@ public: * (E.g., block::work method) or deadlock will occur when * reconfiguration happens. */ - virtual void unlock(); + void unlock() override; /*! * Returns a string that lists the edge connections in the @@ -130,7 +130,7 @@ public: top_block_sptr to_top_block(); // Needed for Python type coercion - void setup_rpc(); + void setup_rpc() override; }; inline top_block_sptr cast_to_top_block_sptr(basic_block_sptr block) |