Merge pull request #13443 from Liuchang0812/cleanup-common

common: add override in common and misc

Reviewed-by: Kefu Chai <kchai@redhat.com>

8 files changed, 20 insertions, 20 deletions

diff --git a/src/cls/cephfs/cls_cephfs.cc b/src/cls/cephfs/cls_cephfs.cc
index 3537f68450b..61c51823704 100644
--- a/src/cls/cephfs/cls_cephfs.cc
+++ b/src/cls/cephfs/cls_cephfs.cc
@@ -127,7 +127,7 @@ class PGLSCephFSFilter : public PGLSFilter {
 protected:
   std::string scrub_tag;
 public:
-  int init(bufferlist::iterator& params) {
+  int init(bufferlist::iterator& params) override {
     try {
       InodeTagFilterArgs args;
       args.decode(params);
@@ -145,10 +145,10 @@ public:
     return 0;
   }
 
-  virtual ~PGLSCephFSFilter() {}
-  virtual bool reject_empty_xattr() { return false; }
-  virtual bool filter(const hobject_t &obj, bufferlist& xattr_data,
-                      bufferlist& outdata);
+  ~PGLSCephFSFilter() {}
+  bool reject_empty_xattr() override { return false; }
+  bool filter(const hobject_t &obj, bufferlist& xattr_data,
+                      bufferlist& outdata) override;
 };
 
 bool PGLSCephFSFilter::filter(const hobject_t &obj,
diff --git a/src/cls/hello/cls_hello.cc b/src/cls/hello/cls_hello.cc
index d181d3fab60..48759255b6f 100644
--- a/src/cls/hello/cls_hello.cc
+++ b/src/cls/hello/cls_hello.cc
@@ -252,7 +252,7 @@ static int bad_writer(cls_method_context_t hctx, bufferlist *in, bufferlist *out
 class PGLSHelloFilter : public PGLSFilter {
   string val;
 public:
-  int init(bufferlist::iterator& params) {
+  int init(bufferlist::iterator& params) override {
     try {
       ::decode(xattr, params);
       ::decode(val, params);
@@ -262,9 +262,9 @@ public:
     return 0;
   }
 
-  virtual ~PGLSHelloFilter() {}
-  virtual bool filter(const hobject_t &obj, bufferlist& xattr_data,
-                      bufferlist& outdata)
+  ~PGLSHelloFilter() {}
+  bool filter(const hobject_t &obj, bufferlist& xattr_data,
+                      bufferlist& outdata) override
   {
     if (val.size() != xattr_data.length())
       return false;
diff --git a/src/cls/journal/cls_journal_client.cc b/src/cls/journal/cls_journal_client.cc
index 8d25dee6479..88f221328a4 100644
--- a/src/cls/journal/cls_journal_client.cc
+++ b/src/cls/journal/cls_journal_client.cc
@@ -54,7 +54,7 @@ struct C_ClientList : public C_AioExec {
     rados_completion->release();
   }
 
-  virtual void complete(int r) {
+  void complete(int r) override {
     if (r < 0) {
       finish(r);
       return;
@@ -81,7 +81,7 @@ struct C_ClientList : public C_AioExec {
     }
   }
 
-  virtual void finish(int r) {
+  void finish(int r) override {
     on_finish->complete(r);
     delete this;
   }
@@ -115,7 +115,7 @@ struct C_ImmutableMetadata : public C_AioExec {
     rados_completion->release();
   }
 
-  virtual void finish(int r) {
+  void finish(int r) override {
     if (r == 0) {
       try {
         bufferlist::iterator iter = outbl.begin();
@@ -155,7 +155,7 @@ struct C_MutableMetadata : public C_AioExec {
     rados_completion->release();
   }
 
-  virtual void finish(int r) {
+  void finish(int r) override {
     if (r == 0) {
       try {
         bufferlist::iterator iter = outbl.begin();
diff --git a/src/cls/log/cls_log_client.cc b/src/cls/log/cls_log_client.cc
index 88e10459733..799f7eb43df 100644
--- a/src/cls/log/cls_log_client.cc
+++ b/src/cls/log/cls_log_client.cc
@@ -88,7 +88,7 @@ class LogListCtx : public ObjectOperationCompletion {
 public:
   LogListCtx(list<cls_log_entry> *_entries, string *_marker, bool *_truncated) :
                                       entries(_entries), marker(_marker), truncated(_truncated) {}
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_log_list_ret ret;
       try {
@@ -128,7 +128,7 @@ class LogInfoCtx : public ObjectOperationCompletion {
   cls_log_header *header;
 public:
   explicit LogInfoCtx(cls_log_header *_header) : header(_header) {}
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_log_info_ret ret;
       try {
diff --git a/src/cls/statelog/cls_statelog_client.cc b/src/cls/statelog/cls_statelog_client.cc
index 2ba38686a08..1b68c6f3fb3 100644
--- a/src/cls/statelog/cls_statelog_client.cc
+++ b/src/cls/statelog/cls_statelog_client.cc
@@ -74,7 +74,7 @@ class StateLogListCtx : public ObjectOperationCompletion {
 public:
   StateLogListCtx(list<cls_statelog_entry> *_entries, string *_marker, bool *_truncated) :
                                       entries(_entries), marker(_marker), truncated(_truncated) {}
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_statelog_list_ret ret;
       try {
diff --git a/src/cls/timeindex/cls_timeindex_client.cc b/src/cls/timeindex/cls_timeindex_client.cc
index 6b9abce2e7b..778cf12e066 100644
--- a/src/cls/timeindex/cls_timeindex_client.cc
+++ b/src/cls/timeindex/cls_timeindex_client.cc
@@ -111,7 +111,7 @@ public:
                    bool *_truncated)
     : entries(_entries), marker(_marker), truncated(_truncated) {}
 
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_timeindex_list_ret ret;
       try {
diff --git a/src/cls/user/cls_user_client.cc b/src/cls/user/cls_user_client.cc
index b2b4cbb6484..8bb7d8447b1 100644
--- a/src/cls/user/cls_user_client.cc
+++ b/src/cls/user/cls_user_client.cc
@@ -49,7 +49,7 @@ class ClsUserListCtx : public ObjectOperationCompletion {
 public:
   ClsUserListCtx(list<cls_user_bucket_entry> *_entries, string *_marker, bool *_truncated, int *_pret) :
                                       entries(_entries), marker(_marker), truncated(_truncated), pret(_pret) {}
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_user_list_buckets_ret ret;
       try {
@@ -102,7 +102,7 @@ public:
       ret_ctx->put();
     }
   }
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_user_get_header_ret ret;
       try {
diff --git a/src/cls/version/cls_version_client.cc b/src/cls/version/cls_version_client.cc
index fafc62e7537..4c463e3e35a 100644
--- a/src/cls/version/cls_version_client.cc
+++ b/src/cls/version/cls_version_client.cc
@@ -61,7 +61,7 @@ class VersionReadCtx : public ObjectOperationCompletion {
   obj_version *objv;
 public:
   explicit VersionReadCtx(obj_version *_objv) : objv(_objv) {}
-  void handle_completion(int r, bufferlist& outbl) {
+  void handle_completion(int r, bufferlist& outbl) override {
     if (r >= 0) {
       cls_version_read_ret ret;
       try {