mgr: add override in headers

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h
index 52afefbcfa4f70219a5cc66da464eb4eece03206..91ce05776dafa05bd740e900bfd5751eb5ab6cf0 100644 (file)
--- a/src/mgr/DaemonServer.h
+++ b/src/mgr/DaemonServer.h
@@ -61,21 +61,21 @@ public:
       DaemonStateIndex &daemon_state_,
       ClusterState &cluster_state_,
       PyModules &py_modules_);
-  ~DaemonServer();
+  ~DaemonServer() override;
 
-  bool ms_dispatch(Message *m);
-  bool ms_handle_reset(Connection *con) { return false; }
-  void ms_handle_remote_reset(Connection *con) {}
-  bool ms_handle_refused(Connection *con);
+  bool ms_dispatch(Message *m) override;
+  bool ms_handle_reset(Connection *con) override { return false; }
+  void ms_handle_remote_reset(Connection *con) override {}
+  bool ms_handle_refused(Connection *con) override;
   bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
-                         bool force_new);
+                         bool force_new) override;
   bool ms_verify_authorizer(Connection *con,
       int peer_type,
       int protocol,
       ceph::bufferlist& authorizer,
       ceph::bufferlist& authorizer_reply,
       bool& isvalid,
-      CryptoKey& session_key);
+      CryptoKey& session_key) override;
 
   bool handle_open(MMgrOpen *m);
   bool handle_report(MMgrReport *m);

diff --git a/src/mgr/MgrClient.h b/src/mgr/MgrClient.h
index a34ee2e951eb607901b14cbf6476ea326101698d..8f771d891b36ad1f02f42bf0d8c3b73c8ad86939 100644 (file)
--- a/src/mgr/MgrClient.h
+++ b/src/mgr/MgrClient.h
@@ -83,10 +83,10 @@ public:
   void init();
   void shutdown();
 
-  bool ms_dispatch(Message *m);
-  bool ms_handle_reset(Connection *con);
-  void ms_handle_remote_reset(Connection *con) {}
-  bool ms_handle_refused(Connection *con);
+  bool ms_dispatch(Message *m) override;
+  bool ms_handle_reset(Connection *con) override;
+  void ms_handle_remote_reset(Connection *con) override {}
+  bool ms_handle_refused(Connection *con) override;
 
   bool handle_mgr_map(MMgrMap *m);
   bool handle_mgr_configure(MMgrConfigure *m);

diff --git a/src/mgr/MgrContext.h b/src/mgr/MgrContext.h
index bb469b3a2305405aa6be3ef2b6b46519ed26db86..3268e5c8dc4118af3a8c21502d7b5aefcf5befa1 100644 (file)
--- a/src/mgr/MgrContext.h
+++ b/src/mgr/MgrContext.h
@@ -48,7 +48,7 @@ class JSONCommand : public Command
 public:
   json_spirit::mValue json_result;
 
-  void wait()
+  void wait() override
   {
     Command::wait();
 

diff --git a/src/mgr/MgrStandby.h b/src/mgr/MgrStandby.h
index d347cb6905555f700c8ccc980a12bc2994d34fa2..6fa524b87d93785ffa9d8bef91dcf16e633d0cf1 100644 (file)
--- a/src/mgr/MgrStandby.h
+++ b/src/mgr/MgrStandby.h
@@ -45,14 +45,14 @@ protected:
 
 public:
   MgrStandby();
-  ~MgrStandby();
+  ~MgrStandby() override;
 
-  bool ms_dispatch(Message *m);
-  bool ms_handle_reset(Connection *con) { return false; }
-  void ms_handle_remote_reset(Connection *con) {}
+  bool ms_dispatch(Message *m) override;
+  bool ms_handle_reset(Connection *con) override { return false; }
+  void ms_handle_remote_reset(Connection *con) override {}
   bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
-                         bool force_new);
-  bool ms_handle_refused(Connection *con);
+                         bool force_new) override;
+  bool ms_handle_refused(Connection *con) override;
 
   int init();
   void shutdown();

diff --git a/src/mgr/PyFormatter.h b/src/mgr/PyFormatter.h
index a1dbf182d67db5c09ddfdc3996b41c755c3970db..1bc839bc3d72020aef2c334bfea7554852d2e096 100644 (file)
--- a/src/mgr/PyFormatter.h
+++ b/src/mgr/PyFormatter.h
@@ -46,7 +46,7 @@ public:
     }
   }
 
-  ~PyFormatter()
+  ~PyFormatter() override
   {
     cursor = NULL;
     Py_DECREF(root);
@@ -54,12 +54,12 @@ public:
   }
 
   // Obscure, don't care.
-  void open_array_section_in_ns(const char *name, const char *ns)
+  void open_array_section_in_ns(const char *name, const char *ns) override
   {ceph_abort();}
-  void open_object_section_in_ns(const char *name, const char *ns)
+  void open_object_section_in_ns(const char *name, const char *ns) override
   {ceph_abort();}
 
-  void reset()
+  void reset() override
   {
     const bool array = PyList_Check(root);
     Py_DECREF(root);
@@ -70,42 +70,42 @@ public:
     }
   }
 
-  virtual void set_status(int status, const char* status_name) {}
-  virtual void output_header() {};
-  virtual void output_footer() {};
+  void set_status(int status, const char* status_name) override {}
+  void output_header() override {};
+  void output_footer() override {};
 
 
-  virtual void open_array_section(const char *name);
-  void open_object_section(const char *name);
-  void close_section()
+  void open_array_section(const char *name) override;
+  void open_object_section(const char *name) override;
+  void close_section() override
   {
     assert(cursor != root);
     assert(!stack.empty());
     cursor = stack.top();
     stack.pop();
   }
-  void dump_bool(const char *name, bool b);
-  void dump_unsigned(const char *name, uint64_t u);
-  void dump_int(const char *name, int64_t u);
-  void dump_float(const char *name, double d);
-  void dump_string(const char *name, const std::string& s);
-  std::ostream& dump_stream(const char *name);
-  void dump_format_va(const char *name, const char *ns, bool quoted, const char *fmt, va_list ap);
-
-  void flush(std::ostream& os)
+  void dump_bool(const char *name, bool b) override;
+  void dump_unsigned(const char *name, uint64_t u) override;
+  void dump_int(const char *name, int64_t u) override;
+  void dump_float(const char *name, double d) override;
+  void dump_string(const char *name, const std::string& s) override;
+  std::ostream& dump_stream(const char *name) override;
+  void dump_format_va(const char *name, const char *ns, bool quoted, const char *fmt, va_list ap) override;
+
+  void flush(std::ostream& os) override
   {
       // This class is not a serializer: this doens't make sense
       ceph_abort();
   }
 
-  int get_len() const
+  int get_len() const override
   {
       // This class is not a serializer: this doens't make sense
       ceph_abort();
       return 0;
   }
 
-  void write_raw_data(const char *data)
+  void write_raw_data(const char *data) override
   {
       // This class is not a serializer: this doens't make sense
       ceph_abort();

diff --git a/src/mgr/PyState.cc b/src/mgr/PyState.cc
index 5a6a2be56ffd759da861b2c5b8254ca479859fb9..4c8ea9090febaa9e7f482e4dee3aa6a49ea31f43 100644 (file)
--- a/src/mgr/PyState.cc
+++ b/src/mgr/PyState.cc
@@ -44,7 +44,7 @@ public:
     Py_INCREF(python_completion);
   }
 
-  ~MonCommandCompletion()
+  ~MonCommandCompletion() override
   {
     Py_DECREF(python_completion);
   }