From 3f20c28f645b3d2df12af97bf08b1eb8d72f08f8 Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Sun, 31 Jul 2016 11:10:17 +0100 Subject: [PATCH] mon/Monitor.h: add override to virtual functions Signed-off-by: Michal Jarzabek --- src/mon/Monitor.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index ae1dd84bf801b..67b4734b43e7c 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -873,7 +873,7 @@ class Monitor : public Dispatcher, //ms_dispatch handles a lot of logic and we want to reuse it //on forwarded messages, so we create a non-locking version for this class void _ms_dispatch(Message *m); - bool ms_dispatch(Message *m) { + bool ms_dispatch(Message *m) override { lock.Lock(); _ms_dispatch(m); lock.Unlock(); @@ -886,9 +886,9 @@ class Monitor : public Dispatcher, bool ms_verify_authorizer(Connection *con, int peer_type, int protocol, bufferlist& authorizer_data, bufferlist& authorizer_reply, bool& isvalid, CryptoKey& session_key); - bool ms_handle_reset(Connection *con); - void ms_handle_remote_reset(Connection *con) {} - bool ms_handle_refused(Connection *con); + bool ms_handle_reset(Connection *con) override; + void ms_handle_remote_reset(Connection *con) override {} + bool ms_handle_refused(Connection *con) override; int write_default_keyring(bufferlist& bl); void extract_save_mon_key(KeyRing& keyring); @@ -915,9 +915,9 @@ class Monitor : public Dispatcher, static int check_features(MonitorDBStore *store); // config observer - virtual const char** get_tracked_conf_keys() const; - virtual void handle_conf_change(const struct md_config_t *conf, - const std::set &changed); + const char** get_tracked_conf_keys() const override; + void handle_conf_change(const struct md_config_t *conf, + const std::set &changed) override; void update_log_clients(); int sanitize_options();