From 15467a543343d4ebce1ceaba3e1e54745dbd9c27 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 12:00:00 +0800
Subject: [PATCH] libcephfs: 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/include/cephfs/metrics/Types.h | 26 +++++++++++++-------------
 src/libcephfs.cc                   |  2 ++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/include/cephfs/metrics/Types.h b/src/include/cephfs/metrics/Types.h
index a004823c6a00a..2d944bb5b2717 100644
--- a/src/include/cephfs/metrics/Types.h
+++ b/src/include/cephfs/metrics/Types.h
@@ -67,7 +67,7 @@ struct ClientMetricPayloadBase {
     return metric_type;
   }
 
-  void print_type(ostream *out) const {
+  void print_type(std::ostream *out) const {
     *out << metric_type;
   }
 
@@ -111,7 +111,7 @@ struct CapInfoPayload : public ClientMetricPayloadBase {
     f->dump_int("num_caps", nr_caps);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "cap_hits: " << cap_hits << " "
 	 << "cap_misses: " << cap_misses << " "
 	 << "num_caps: " << nr_caps;
@@ -145,7 +145,7 @@ struct ReadLatencyPayload : public ClientMetricPayloadBase {
     f->dump_int("latency", lat);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "latency: " << lat;
   }
 };
@@ -177,7 +177,7 @@ struct WriteLatencyPayload : public ClientMetricPayloadBase {
     f->dump_int("latency", lat);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "latency: " << lat;
   }
 };
@@ -209,7 +209,7 @@ struct MetadataLatencyPayload : public ClientMetricPayloadBase {
     f->dump_int("latency", lat);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "latency: " << lat;
   }
 };
@@ -249,7 +249,7 @@ struct DentryLeasePayload : public ClientMetricPayloadBase {
     f->dump_int("num_dentries", nr_dentries);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "dlease_hits: " << dlease_hits << " "
 	 << "dlease_misses: " << dlease_misses << " "
 	 << "num_dentries: " << nr_dentries;
@@ -287,7 +287,7 @@ struct OpenedFilesPayload : public ClientMetricPayloadBase {
     f->dump_int("total_inodes", total_inodes);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "opened_files: " << opened_files << " "
 	 << "total_inodes: " << total_inodes;
   }
@@ -324,7 +324,7 @@ struct PinnedIcapsPayload : public ClientMetricPayloadBase {
     f->dump_int("total_inodes", total_inodes);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "pinned_icaps: " << pinned_icaps << " "
 	 << "total_inodes: " << total_inodes;
   }
@@ -361,7 +361,7 @@ struct OpenedInodesPayload : public ClientMetricPayloadBase {
     f->dump_int("total_inodes", total_inodes);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     *out << "opened_inodes: " << opened_inodes << " "
 	 << "total_inodes: " << total_inodes;
   }
@@ -386,7 +386,7 @@ struct UnknownPayload : public ClientMetricPayloadBase {
   void dump(Formatter *f) const {
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
   }
 };
 
@@ -455,7 +455,7 @@ public:
 
   class PrintPayloadVisitor : public boost::static_visitor<void> {
   public:
-    explicit PrintPayloadVisitor(ostream *out) : _out(out) {
+    explicit PrintPayloadVisitor(std::ostream *out) : _out(out) {
     }
 
     template <typename ClientMetricPayload>
@@ -468,7 +468,7 @@ public:
     }
 
   private:
-    ostream *_out;
+    std::ostream *_out;
   };
 
   void encode(bufferlist &bl) const {
@@ -518,7 +518,7 @@ public:
     apply_visitor(DumpPayloadVisitor(f), payload);
   }
 
-  void print(ostream *out) const {
+  void print(std::ostream *out) const {
     apply_visitor(PrintPayloadVisitor(out), payload);
   }
 
diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index a379b7b6bf780..63af614bcefdb 100644
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -37,6 +37,8 @@
 
 #define DEFAULT_UMASK 002
 
+using namespace std;
+
 static mode_t umask_cb(void *);
 namespace {
 // Set things up this way so we don't start up threads until mount and
-- 
2.39.5