Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon/Monitor.h: add override to virtual functions #10515

Merged
merged 1 commit into from Sep 20, 2016
Merged

mon/Monitor.h: add override to virtual functions #10515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/mon/Monitor.h
View file
Open in desktop
Expand Up @@ -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();
Expand All @@ -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);
Expand All @@ -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<std::string> &changed);
const char** get_tracked_conf_keys() const override;
void handle_conf_change(const struct md_config_t *conf,
const std::set<std::string> &changed) override;

void update_log_clients();
int sanitize_options();
Expand Down