From 7239e1c1fd6f1b6862a5973d15379e70b00362a4 Mon Sep 17 00:00:00 2001
From: Michal Jarzabek <stiopa@gmail.com>
Date: Sat, 20 Aug 2016 09:18:09 +0100
Subject: [PATCH] os/Memstore.h: add override to virtual functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---
 src/os/memstore/MemStore.h | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h
index 1759932e7fe84..abd6f87070c88 100644
--- a/src/os/memstore/MemStore.h
+++ b/src/os/memstore/MemStore.h
@@ -354,35 +354,35 @@ public:
       used_bytes(0) {}
   ~MemStore() { }
 
-  string get_type() {
+  string get_type() override {
     return "memstore";
   }
 
-  bool test_mount_in_use() {
+  bool test_mount_in_use() override {
     return false;
   }
 
-  int mount();
-  int umount();
+  int mount() override;
+  int umount() override;
 
   int validate_hobject_key(const hobject_t &obj) const override {
     return 0;
   }
-  unsigned get_max_attr_name_length() {
+  unsigned get_max_attr_name_length() override {
     return 256;  // arbitrary; there is no real limit internally
   }
 
-  int mkfs();
-  int mkjournal() {
+  int mkfs() override;
+  int mkjournal() override {
     return 0;
   }
-  bool wants_journal() {
+  bool wants_journal() override {
     return false;
   }
-  bool allows_journal() {
+  bool allows_journal() override {
     return false;
   }
-  bool needs_journal() {
+  bool needs_journal() override {
     return false;
   }
 
@@ -411,7 +411,7 @@ public:
     uint32_t op_flags = 0,
     bool allow_eio = false) override;
   using ObjectStore::fiemap;
-  int fiemap(const coll_t& cid, const ghobject_t& oid, uint64_t offset, size_t len, bufferlist& bl);
+  int fiemap(const coll_t& cid, const ghobject_t& oid, uint64_t offset, size_t len, bufferlist& bl) override;
   int getattr(const coll_t& cid, const ghobject_t& oid, const char *name,
 	      bufferptr& value) override;
   int getattr(CollectionHandle &c, const ghobject_t& oid, const char *name,
@@ -421,17 +421,17 @@ public:
   int getattrs(CollectionHandle &c, const ghobject_t& oid,
 	       map<string,bufferptr>& aset) override;
 
-  int list_collections(vector<coll_t>& ls);
+  int list_collections(vector<coll_t>& ls) override;
 
-  CollectionHandle open_collection(const coll_t& c) {
+  CollectionHandle open_collection(const coll_t& c) override {
     return get_collection(c);
   }
-  bool collection_exists(const coll_t& c);
-  bool collection_empty(const coll_t& c);
+  bool collection_exists(const coll_t& c) override;
+  bool collection_empty(const coll_t& c) override;
   using ObjectStore::collection_list;
   int collection_list(const coll_t& cid, ghobject_t start, ghobject_t end,
 		      bool sort_bitwise, int max,
-		      vector<ghobject_t> *ls, ghobject_t *next);
+		      vector<ghobject_t> *ls, ghobject_t *next) override;
 
   using ObjectStore::omap_get;
   int omap_get(
@@ -439,7 +439,7 @@ public:
     const ghobject_t &oid,   ///< [in] Object containing omap
     bufferlist *header,      ///< [out] omap header
     map<string, bufferlist> *out /// < [out] Key to value map
-    );
+    ) override;
 
   using ObjectStore::omap_get_header;
   /// Get omap header
@@ -448,7 +448,7 @@ public:
     const ghobject_t &oid,   ///< [in] Object containing omap
     bufferlist *header,      ///< [out] omap header
     bool allow_eio = false ///< [in] don't assert on eio
-    );
+    ) override;
 
   using ObjectStore::omap_get_keys;
   /// Get keys defined on oid
@@ -456,7 +456,7 @@ public:
     const coll_t& cid,              ///< [in] Collection containing oid
     const ghobject_t &oid, ///< [in] Object containing omap
     set<string> *keys      ///< [out] Keys defined on oid
-    );
+    ) override;
 
   using ObjectStore::omap_get_values;
   /// Get key values
@@ -465,7 +465,7 @@ public:
     const ghobject_t &oid,       ///< [in] Object containing omap
     const set<string> &keys,     ///< [in] Keys to get
     map<string, bufferlist> *out ///< [out] Returned keys and values
-    );
+    ) override;
 
   using ObjectStore::omap_check_keys;
   /// Filters keys into out which are defined on oid
@@ -474,27 +474,27 @@ public:
     const ghobject_t &oid,   ///< [in] Object containing omap
     const set<string> &keys, ///< [in] Keys to check
     set<string> *out         ///< [out] Subset of keys defined on oid
-    );
+    ) override;
 
   using ObjectStore::get_omap_iterator;
   ObjectMap::ObjectMapIterator get_omap_iterator(
     const coll_t& cid,              ///< [in] collection
     const ghobject_t &oid  ///< [in] object
-    );
+    ) override;
 
-  void set_fsid(uuid_d u);
-  uuid_d get_fsid();
+  void set_fsid(uuid_d u) override;
+  uuid_d get_fsid() override;
 
   uint64_t estimate_objects_overhead(uint64_t num_objects) override {
     return 0; //do not care
   }
 
-  objectstore_perf_stat_t get_cur_stats();
+  objectstore_perf_stat_t get_cur_stats() override;
 
   int queue_transactions(
     Sequencer *osr, vector<Transaction>& tls,
     TrackedOpRef op = TrackedOpRef(),
-    ThreadPool::TPHandle *handle = NULL);
+    ThreadPool::TPHandle *handle = NULL) override;
 };
 
 
-- 
2.39.5