]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd_mirror: Fix overloaded virtual warning in Clang++
authorAdam C. Emerson <aemerson@redhat.com>
Wed, 4 Oct 2017 14:53:51 +0000 (10:53 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 5 Oct 2017 16:25:16 +0000 (12:25 -0400)
Just pull in the original function with a using.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/tools/rbd_mirror/InstanceWatcher.h
src/tools/rbd_mirror/LeaderWatcher.h

index be90f10e213736dd635bfbd5e51d64c60760a033..c3cd60500f75f617dfa3c3e1323e3cdb09e79f9e 100644 (file)
@@ -31,6 +31,7 @@ template <typename> struct Threads;
 
 template <typename ImageCtxT = librbd::ImageCtx>
 class InstanceWatcher : protected librbd::Watcher {
+  using librbd::Watcher::unregister_watch; // Silence overloaded virtual warning
 public:
   static void get_instances(librados::IoCtx &io_ctx,
                             std::vector<std::string> *instance_ids,
index 980e2e6826add2c0fa9c73d29c7992aa2a660191..86982fee676390edb621cd5e85eeb4119f2b8b75 100644 (file)
@@ -26,6 +26,7 @@ template <typename> struct Threads;
 
 template <typename ImageCtxT = librbd::ImageCtx>
 class LeaderWatcher : protected librbd::Watcher {
+  using librbd::Watcher::unregister_watch; // Silence overloaded virtual warning
 public:
   struct Listener {
     virtual ~Listener() {