From: Francis Dupont Date: Tue, 1 Jun 2021 08:53:51 +0000 (+0200) Subject: [(no branch, rebasing 1899-warnings-during-compilation)] [#1899] Added missing overri... X-Git-Tag: Kea-1.9.9~152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cac57337720534213619aee849959930e5cd27ea;p=thirdparty%2Fkea.git [(no branch, rebasing 1899-warnings-during-compilation)] [#1899] Added missing override keywords --- diff --git a/src/bin/agent/ca_cfg_mgr.h b/src/bin/agent/ca_cfg_mgr.h index 943a8b4269..6234bd44f6 100644 --- a/src/bin/agent/ca_cfg_mgr.h +++ b/src/bin/agent/ca_cfg_mgr.h @@ -273,7 +273,7 @@ public: /// to be returned. This parameter is ignored for the Control Agent. /// /// @return Summary of the configuration in the textual format. - virtual std::string getConfigSummary(const uint32_t selection); + virtual std::string getConfigSummary(const uint32_t selection) override; protected: @@ -284,7 +284,7 @@ protected: /// only verify correctness of the provided configuration. /// @return Pointer to a result of configuration parsing. virtual isc::data::ConstElementPtr - parse(isc::data::ConstElementPtr config, bool check_only); + parse(isc::data::ConstElementPtr config, bool check_only) override; /// @brief Creates a new, blank CtrlAgentCfgContext context. /// @@ -296,7 +296,7 @@ protected: /// error. /// /// @return Returns a ConfigPtr to the new context instance. - virtual process::ConfigPtr createNewContext(); + virtual process::ConfigPtr createNewContext() override; /// @brief Return a list of all paths that contain passwords or secrets. /// diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h index 199d435486..11b6a0c538 100644 --- a/src/bin/d2/d2_cfg_mgr.h +++ b/src/bin/d2/d2_cfg_mgr.h @@ -280,7 +280,7 @@ public: /// to be returned. This parameter is ignored for the D2. /// /// @return Summary of the configuration in the textual format. - virtual std::string getConfigSummary(const uint32_t selection); + virtual std::string getConfigSummary(const uint32_t selection) override; std::list> jsonPathsToRedact() const final override; @@ -292,7 +292,7 @@ protected: /// only verify correctness of the provided configuration. /// @return Pointer to a result of configuration parsing. virtual isc::data::ConstElementPtr - parse(isc::data::ConstElementPtr config, bool check_only); + parse(isc::data::ConstElementPtr config, bool check_only) override; /// @brief Adds default values to the given config /// @@ -300,7 +300,7 @@ protected: /// method is invoked by @c DCfgMgrBase::parseConfig(). /// /// @param mutable_config - configuration to which defaults should be added - virtual void setCfgDefaults(isc::data::ElementPtr mutable_config); + virtual void setCfgDefaults(isc::data::ElementPtr mutable_config) override; /// @brief Creates an new, blank D2CfgContext context /// @@ -311,14 +311,13 @@ protected: /// error. /// /// @return Returns a ConfigPtr to the new context instance. - virtual process::ConfigPtr createNewContext(); + virtual process::ConfigPtr createNewContext() override; }; /// @brief Defines a shared pointer to D2CfgMgr. typedef boost::shared_ptr D2CfgMgrPtr; - -}; // end of isc::d2 namespace -}; // end of isc namespace +} // end of isc::d2 namespace +} // end of isc namespace #endif // D2_CFG_MGR_H diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h index 881a48f87d..147d12c121 100644 --- a/src/bin/dhcp4/dhcp4_srv.h +++ b/src/bin/dhcp4/dhcp4_srv.h @@ -383,7 +383,7 @@ public: bool allow_packet_park); /// @brief Instructs the server to shut down. - void shutdown(); + void shutdown() override; /// /// @name Public accessors returning values required to (re)open sockets. diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h index c5c2bf05f7..349a2bb204 100644 --- a/src/bin/dhcp6/dhcp6_srv.h +++ b/src/bin/dhcp6/dhcp6_srv.h @@ -200,7 +200,7 @@ public: void processDhcp6QueryAndSendResponse(Pkt6Ptr& query, Pkt6Ptr& rsp); /// @brief Instructs the server to shut down. - void shutdown(); + void shutdown() override; /// /// @name Public accessors returning values required to (re)open sockets.