Merge pull request #7315 from tchaikov/wip-kill-warnings

Wip kill warnings Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Jan 25, 2016 · 2488ad1 · 2488ad1
2 parents acd4314 + 3ebb584
commit 2488ad1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/src/client/ObjecterWriteback.h b/src/client/ObjecterWriteback.h
@@ -43,6 +43,7 @@ class ObjecterWriteback : public WritebackHandler {
   }
 
   virtual bool can_scattered_write() { return true; }
+  using WritebackHandler::write;
   virtual ceph_tid_t write(const object_t& oid, const object_locator_t& oloc,
                            vector<pair<uint64_t, bufferlist> >& io_vec,
 			   const SnapContext& snapc, ceph::real_time mtime,

diff --git a/src/kv/KineticStore.h b/src/kv/KineticStore.h
@@ -106,6 +106,7 @@ class KineticStore : public KeyValueDB {
     const std::set<string> &key,
     std::map<string, bufferlist> *out
     );
+  using KeyValueDB::get;
 
   class KineticWholeSpaceIteratorImpl :
     public KeyValueDB::WholeSpaceIteratorImpl {

diff --git a/src/librbd/LibrbdWriteback.h b/src/librbd/LibrbdWriteback.h
@@ -39,6 +39,7 @@ namespace librbd {
 			     ceph::real_time mtime, uint64_t trunc_size,
 			     __u32 trunc_seq, ceph_tid_t journal_tid,
 			     Context *oncommit);
+    using WritebackHandler::write;
 
     virtual void overwrite_extent(const object_t& oid, uint64_t off,
 				  uint64_t len, ceph_tid_t journal_tid);

diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h
@@ -34,6 +34,7 @@ class KeyValueDBMemory : public KeyValueDB {
     const std::set<string> &key,
     std::map<string, bufferlist> *out
     );
+  using KeyValueDB::get;
 
   int get_keys(
     const string &prefix,

diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc
@@ -58,6 +58,7 @@ class ServerDispatcher : public Dispatcher {
       messages.pop_front();
       return m;
     }
+    using ThreadPool::WorkQueue<Message>::_process;
     void _process(Message *m, ThreadPool::TPHandle &handle) {
       MOSDOp *osd_op = static_cast<MOSDOp*>(m);
       MOSDOpReply *reply = new MOSDOpReply(osd_op, 0, 0, 0, false);

diff --git a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc
@@ -92,15 +92,13 @@ class Transaction {
       switch (op->op) {
       case ObjectStore::Transaction::OP_WRITE:
         {
-          coll_t cid = i.get_cid(op->cid);
           ghobject_t oid = i.get_oid(op->oid);
           bufferlist bl;
           i.decode_bl(bl);
         }
         break;
       case ObjectStore::Transaction::OP_SETATTR:
         {
-          coll_t cid = i.get_cid(op->cid);
           ghobject_t oid = i.get_oid(op->oid);
           string name = i.decode_string();
           bufferlist bl;
@@ -111,15 +109,13 @@ class Transaction {
         break;
       case ObjectStore::Transaction::OP_OMAP_SETKEYS:
         {
-          coll_t cid = i.get_cid(op->cid);
           ghobject_t oid = i.get_oid(op->oid);
           map<string, bufferptr> aset;
           i.decode_attrset(aset);
         }
         break;
       case ObjectStore::Transaction::OP_OMAP_RMKEYS:
         {
-          coll_t cid = i.get_cid(op->cid);
           ghobject_t oid = i.get_oid(op->oid);
           set<string> keys;
           i.decode_keyset(keys);

diff --git a/src/test/osdc/FakeWriteback.h b/src/test/osdc/FakeWriteback.h
@@ -29,6 +29,8 @@ class FakeWriteback : public WritebackHandler {
 			   __u32 trunc_seq, ceph_tid_t journal_tid,
 			   Context *oncommit);
 
+  using WritebackHandler::write;
+
   virtual bool may_copy_on_write(const object_t&, uint64_t, uint64_t,
 				 snapid_t);
 private: