From d796bc7a7639c614cb4287e50111b72d09146e9f Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Wed, 4 Oct 2017 10:53:51 -0400
Subject: [PATCH] rbd_mirror: Fix overloaded virtual warning in Clang++

Just pull in the original function with a using.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/tools/rbd_mirror/InstanceWatcher.h | 1 +
 src/tools/rbd_mirror/LeaderWatcher.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/tools/rbd_mirror/InstanceWatcher.h b/src/tools/rbd_mirror/InstanceWatcher.h
index be90f10e213..c3cd60500f7 100644
--- a/src/tools/rbd_mirror/InstanceWatcher.h
+++ b/src/tools/rbd_mirror/InstanceWatcher.h
@@ -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,
diff --git a/src/tools/rbd_mirror/LeaderWatcher.h b/src/tools/rbd_mirror/LeaderWatcher.h
index 980e2e6826a..86982fee676 100644
--- a/src/tools/rbd_mirror/LeaderWatcher.h
+++ b/src/tools/rbd_mirror/LeaderWatcher.h
@@ -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() {
-- 
2.39.5