librados: add override in headers

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

diff --git a/src/librados/AioCompletionImpl.h b/src/librados/AioCompletionImpl.h
index b55b81d03006f2313ceaf998c2e3ce4721d8e175..020341c242bd3d03f2ad9ff4f99f1f2facefdfd9 100644 (file)
--- a/src/librados/AioCompletionImpl.h
+++ b/src/librados/AioCompletionImpl.h
@@ -162,7 +162,7 @@ struct C_AioComplete : public Context {
     c->_get();
   }
 
-  void finish(int r) {
+  void finish(int r) override {
     rados_callback_t cb_complete = c->callback_complete;
     void *cb_complete_arg = c->callback_complete_arg;
     if (cb_complete)
@@ -196,7 +196,7 @@ struct C_AioCompleteAndSafe : public Context {
     c->get();
   }
 
-  void finish(int r) {
+  void finish(int r) override {
     c->lock.Lock();
     c->rval = r;
     c->complete = true;

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 16662ca9e889b6f143f4d1d271e3a8d8da761188..b232e05c837bd4d905e5e94e95fa4c10f578947d 100644 (file)
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -1525,7 +1525,7 @@ struct WatchInfo : public Objecter::WatchContext {
     : ioctx(io), oid(o), ctx(c), ctx2(c2), internal(inter) {
     ioctx->get();
   }
-  ~WatchInfo() {
+  ~WatchInfo() override {
     ioctx->put();
     if (internal) {
       delete ctx;

diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
index 3db028398a577f70bc65f96b80646768dfc0cc0a..2df28325ad59a542239db0dbf06dd080dcc6b9b8 100644 (file)
--- a/src/librados/IoCtxImpl.h
+++ b/src/librados/IoCtxImpl.h
@@ -160,7 +160,7 @@ struct librados::IoCtxImpl {
     time_t *pmtime;
     ceph::real_time mtime;
     C_aio_stat_Ack(AioCompletionImpl *_c, time_t *pm);
-    void finish(int r);
+    void finish(int r) override;
   };
 
   struct C_aio_stat2_Ack : public Context {
@@ -168,7 +168,7 @@ struct librados::IoCtxImpl {
     struct timespec *pts;
     ceph::real_time mtime;
     C_aio_stat2_Ack(AioCompletionImpl *_c, struct timespec *pts);
-    void finish(int r);
+    void finish(int r) override;
   };
 
   struct C_aio_Complete : public Context {
@@ -177,7 +177,7 @@ struct librados::IoCtxImpl {
 #endif
     AioCompletionImpl *c;
     explicit C_aio_Complete(AioCompletionImpl *_c);
-    void finish(int r);
+    void finish(int r) override;
   };
 
   int aio_read(const object_t oid, AioCompletionImpl *c,

diff --git a/src/librados/PoolAsyncCompletionImpl.h b/src/librados/PoolAsyncCompletionImpl.h
index b3fba491b445c1cc1c9c5c235cb28adc99ee954a..e876db756fc85fdb8fbc023e8e89293f6d53d9d6 100644 (file)
--- a/src/librados/PoolAsyncCompletionImpl.h
+++ b/src/librados/PoolAsyncCompletionImpl.h
@@ -94,11 +94,11 @@ namespace librados {
     explicit C_PoolAsync_Safe(PoolAsyncCompletionImpl *_c) : c(_c) {
       c->get();
     }
-    ~C_PoolAsync_Safe() {
+    ~C_PoolAsync_Safe() override {
       c->put();
     }
   
-    void finish(int r) {
+    void finish(int r) override {
       c->lock.Lock();
       c->rval = r;
       c->done = true;

diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index 557d14f241ea87c318ad6702833397f7e844120b..39e9a49570762c5ab47a2e6f572ed9752ff1a732 100644 (file)
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -57,13 +57,13 @@ private:
   uint64_t instance_id;
 
   bool _dispatch(Message *m);
-  bool ms_dispatch(Message *m);
+  bool ms_dispatch(Message *m) override;
 
-  bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new);
-  void ms_handle_connect(Connection *con);
-  bool ms_handle_reset(Connection *con);
-  void ms_handle_remote_reset(Connection *con);
-  bool ms_handle_refused(Connection *con);
+  bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new) override;
+  void ms_handle_connect(Connection *con) override;
+  bool ms_handle_reset(Connection *con) override;
+  void ms_handle_remote_reset(Connection *con) override;
+  bool ms_handle_refused(Connection *con) override;
 
   Objecter *objecter;
 
@@ -83,7 +83,7 @@ public:
   Finisher finisher;
 
   explicit RadosClient(CephContext *cct_);
-  ~RadosClient();
+  ~RadosClient() override;
   int ping_monitor(string mon_id, string *result);
   int connect();
   void shutdown();

diff --git a/src/libradosstriper/RadosStriperImpl.h b/src/libradosstriper/RadosStriperImpl.h
index f6d74822698d6c86fb91a1d7d614a79c62462f29..9ac7da0e359cae472fc5fb659332767b2d54a033 100644 (file)
--- a/src/libradosstriper/RadosStriperImpl.h
+++ b/src/libradosstriper/RadosStriperImpl.h
@@ -42,7 +42,7 @@ struct libradosstriper::RadosStriperImpl {
                   librados::AioCompletionImpl *userCompletion = 0,
                    int n = 1);
     /// destructor
-    virtual ~CompletionData();
+    ~CompletionData() override;
     /// complete method
     void complete(int r);
     /// striper to be used to handle the write completion
@@ -80,7 +80,7 @@ struct libradosstriper::RadosStriperImpl {
                       std::vector<bufferlist>* resultbl,
                        int n);
     /// destructor
-    virtual ~ReadCompletionData();
+    ~ReadCompletionData() override;
     /// complete method for when reading is over
     void complete_read(int r);
     /// complete method for when object is unlocked
@@ -105,7 +105,7 @@ struct libradosstriper::RadosStriperImpl {
                        librados::AioCompletionImpl *userCompletion,
                         int n);
     /// destructor
-    virtual ~WriteCompletionData();
+    ~WriteCompletionData() override;
     /// complete method for when writing is over
     void complete_write(int r);
     /// complete method for when object is unlocked
@@ -230,7 +230,7 @@ struct libradosstriper::RadosStriperImpl {
                           const std::string& soid,
                           uint64_t size);
     /// destructor
-    virtual ~TruncateCompletionData();
+    ~TruncateCompletionData() override;
     /// striper to be used
     libradosstriper::RadosStriperImpl *m_striper;
     /// striped object concerned by the truncate operation