From ef9682e9e899fa3ee9fa23069829aa62bf911ed2 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 17:57:00 +0800
Subject: [PATCH] cephfs-mirror: build without "using namespace std"

* add "std::" prefix in headers
* add "using" declarations in .cc files.

so we don't rely on "using namespace std" in one or more included
headers.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/tools/cephfs_mirror/FSMirror.cc        | 2 ++
 src/tools/cephfs_mirror/FSMirror.h         | 8 ++++----
 src/tools/cephfs_mirror/InstanceWatcher.cc | 2 ++
 src/tools/cephfs_mirror/InstanceWatcher.h  | 4 ++--
 src/tools/cephfs_mirror/PeerReplayer.cc    | 2 ++
 src/tools/cephfs_mirror/PeerReplayer.h     | 4 ++--
 src/tools/cephfs_mirror/main.cc            | 2 ++
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc
index 76dcc11f6c6..a0bf75d1e29 100644
--- a/src/tools/cephfs_mirror/FSMirror.cc
+++ b/src/tools/cephfs_mirror/FSMirror.cc
@@ -23,6 +23,8 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "cephfs::mirror::FSMirror " << __func__
 
+using namespace std;
+
 namespace cephfs {
 namespace mirror {
 
diff --git a/src/tools/cephfs_mirror/FSMirror.h b/src/tools/cephfs_mirror/FSMirror.h
index bae5a38e1b5..d2c9c07782a 100644
--- a/src/tools/cephfs_mirror/FSMirror.h
+++ b/src/tools/cephfs_mirror/FSMirror.h
@@ -92,11 +92,11 @@ private:
       : fs_mirror(fs_mirror) {
     }
 
-    void acquire_directory(string_view dir_path) override {
+    void acquire_directory(std::string_view dir_path) override {
       fs_mirror->handle_acquire_directory(dir_path);
     }
 
-    void release_directory(string_view dir_path) override {
+    void release_directory(std::string_view dir_path) override {
       fs_mirror->handle_release_directory(dir_path);
     }
   };
@@ -148,8 +148,8 @@ private:
   void shutdown_instance_watcher();
   void handle_shutdown_instance_watcher(int r);
 
-  void handle_acquire_directory(string_view dir_path);
-  void handle_release_directory(string_view dir_path);
+  void handle_acquire_directory(std::string_view dir_path);
+  void handle_release_directory(std::string_view dir_path);
 };
 
 } // namespace mirror
diff --git a/src/tools/cephfs_mirror/InstanceWatcher.cc b/src/tools/cephfs_mirror/InstanceWatcher.cc
index 9c357da3185..aeb474274fb 100644
--- a/src/tools/cephfs_mirror/InstanceWatcher.cc
+++ b/src/tools/cephfs_mirror/InstanceWatcher.cc
@@ -17,6 +17,8 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "cephfs::mirror::InstanceWatcher " << __func__
 
+using namespace std;
+
 namespace cephfs {
 namespace mirror {
 
diff --git a/src/tools/cephfs_mirror/InstanceWatcher.h b/src/tools/cephfs_mirror/InstanceWatcher.h
index 06edf5da97a..dfe0cd05990 100644
--- a/src/tools/cephfs_mirror/InstanceWatcher.h
+++ b/src/tools/cephfs_mirror/InstanceWatcher.h
@@ -25,8 +25,8 @@ public:
     virtual ~Listener() {
     }
 
-    virtual void acquire_directory(string_view dir_path) = 0;
-    virtual void release_directory(string_view dir_path) = 0;
+    virtual void acquire_directory(std::string_view dir_path) = 0;
+    virtual void release_directory(std::string_view dir_path) = 0;
   };
 
   static InstanceWatcher *create(librados::IoCtx &ioctx,
diff --git a/src/tools/cephfs_mirror/PeerReplayer.cc b/src/tools/cephfs_mirror/PeerReplayer.cc
index 44796cb4973..d5ab7a215a1 100644
--- a/src/tools/cephfs_mirror/PeerReplayer.cc
+++ b/src/tools/cephfs_mirror/PeerReplayer.cc
@@ -24,6 +24,8 @@
 #define dout_prefix *_dout << "cephfs::mirror::PeerReplayer("   \
                            << m_peer.uuid << ") " << __func__
 
+using namespace std;
+
 namespace cephfs {
 namespace mirror {
 
diff --git a/src/tools/cephfs_mirror/PeerReplayer.h b/src/tools/cephfs_mirror/PeerReplayer.h
index 886c9532944..d45d3087e8d 100644
--- a/src/tools/cephfs_mirror/PeerReplayer.h
+++ b/src/tools/cephfs_mirror/PeerReplayer.h
@@ -31,10 +31,10 @@ public:
   void shutdown();
 
   // add a directory to mirror queue
-  void add_directory(string_view dir_root);
+  void add_directory(std::string_view dir_root);
 
   // remove a directory from queue
-  void remove_directory(string_view dir_root);
+  void remove_directory(std::string_view dir_root);
 
   // admin socket helpers
   void peer_status(Formatter *f);
diff --git a/src/tools/cephfs_mirror/main.cc b/src/tools/cephfs_mirror/main.cc
index efaa89c3593..2e1dd05edc1 100644
--- a/src/tools/cephfs_mirror/main.cc
+++ b/src/tools/cephfs_mirror/main.cc
@@ -15,6 +15,8 @@
 
 #include <vector>
 
+using namespace std;
+
 void usage() {
   std::cout << "usage: cephfs-mirror [options...]" << std::endl;
   std::cout << "options:\n";
-- 
2.39.5