From de79404f70441a1035ffcf1c9bfabdb278d727d6 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 1f6be858d0dca..772b104dba3e2 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -887,7 +887,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(); @@ -900,8 +900,8 @@ 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_reset(Connection *con) override; + void ms_handle_remote_reset(Connection *con) override {} int write_default_keyring(bufferlist& bl); void extract_save_mon_key(KeyRing& keyring); @@ -928,9 +928,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();