From e096e8c00d84fab0967da46661677fba3dcf0700 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 11:58:38 +0800
Subject: [PATCH] blk: 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/blk/kernel/KernelDevice.cc | 2 +-
 src/blk/kernel/io_uring.cc     | 3 +++
 src/blk/spdk/NVMEDevice.cc     | 2 ++
 src/blk/spdk/NVMEDevice.h      | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
index 304bcd732d4..66e9bc622d7 100644
--- a/src/blk/kernel/KernelDevice.cc
+++ b/src/blk/kernel/KernelDevice.cc
@@ -1064,7 +1064,7 @@ int KernelDevice::read(uint64_t off, uint64_t len, bufferlist *pbl,
     } else {
       r = -errno;
     }
-    derr << __func__ << " 0x" << std::hex << off << "~" << left
+    derr << __func__ << " 0x" << std::hex << off << "~" << std::left
          << std::dec << " error: " << cpp_strerror(r) << dendl;
     goto out;
   }
diff --git a/src/blk/kernel/io_uring.cc b/src/blk/kernel/io_uring.cc
index 17bd35bb4c0..5e7fd122704 100644
--- a/src/blk/kernel/io_uring.cc
+++ b/src/blk/kernel/io_uring.cc
@@ -8,6 +8,9 @@
 #include "liburing.h"
 #include <sys/epoll.h>
 
+using std::list;
+using std::make_unique;
+
 struct ioring_data {
   struct io_uring io_uring;
   pthread_mutex_t cq_mutex;
diff --git a/src/blk/spdk/NVMEDevice.cc b/src/blk/spdk/NVMEDevice.cc
index 6bdf67b14ef..80377cd9b97 100644
--- a/src/blk/spdk/NVMEDevice.cc
+++ b/src/blk/spdk/NVMEDevice.cc
@@ -47,6 +47,8 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "bdev(" << sn << ") "
 
+using namespace std;
+
 static constexpr uint16_t data_buffer_default_num = 1024;
 
 static constexpr uint32_t data_buffer_size = 8192;
diff --git a/src/blk/spdk/NVMEDevice.h b/src/blk/spdk/NVMEDevice.h
index cbd094d655d..323d7281f03 100644
--- a/src/blk/spdk/NVMEDevice.h
+++ b/src/blk/spdk/NVMEDevice.h
@@ -45,7 +45,7 @@ class NVMEDevice : public BlockDevice {
    * target for CONTROLLER IDENTIFY command during initialization
    */
   SharedDriverData *driver;
-  string name;
+  std::string name;
 
  public:
   SharedDriverData *get_driver() { return driver; }
@@ -76,9 +76,9 @@ class NVMEDevice : public BlockDevice {
 
   // for managing buffered readers/writers
   int invalidate_cache(uint64_t off, uint64_t len) override;
-  int open(const string& path) override;
+  int open(const std::string& path) override;
   void close() override;
-  int collect_metadata(const string& prefix, map<string,string> *pm) const override;
+  int collect_metadata(const std::string& prefix, std::map<std::string,std::string> *pm) const override;
 };
 
 #endif
-- 
2.39.5