From b7746d84a02f35519598323e90eb61d13d17ee32 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 20:33:05 -0400
Subject: [PATCH] osd: Update OpRequest to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/osd/OpRequest.cc |  7 +++++++
 src/osd/OpRequest.h  | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 35ff7f28d9e..7a9002cc7bc 100644
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -23,6 +23,13 @@
 #define tracepoint(...)
 #endif
 
+using std::ostream;
+using std::set;
+using std::string;
+using std::stringstream;
+
+using ceph::Formatter;
+
 OpRequest::OpRequest(Message *req, OpTracker *tracker) :
   TrackedOp(tracker, req->get_recv_stamp()),
   rmw_flags(0), request(req),
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 184d26acc29..896317b161e 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -71,7 +71,7 @@ struct OpRequest : public TrackedOp {
     return classes_;
   }
 
-  void _dump(Formatter *f) const override;
+  void _dump(ceph::Formatter *f) const override;
 
   bool has_feature(uint64_t f) const {
     return request->get_connection()->has_feature(f);
@@ -96,9 +96,9 @@ private:
   OpRequest(Message *req, OpTracker *tracker);
 
 protected:
-  void _dump_op_descriptor_unlocked(ostream& stream) const override;
+  void _dump_op_descriptor_unlocked(std::ostream& stream) const override;
   void _unregistered() override;
-  bool filter_out(const set<string>& filters) override;
+  bool filter_out(const std::set<std::string>& filters) override;
 
 public:
   ~OpRequest() override {
@@ -140,13 +140,13 @@ public:
   void mark_reached_pg() {
     mark_flag_point(flag_reached_pg, "reached_pg");
   }
-  void mark_delayed(const string& s) {
+  void mark_delayed(const std::string& s) {
     mark_flag_point_string(flag_delayed, s);
   }
   void mark_started() {
     mark_flag_point(flag_started, "started");
   }
-  void mark_sub_op_sent(const string& s) {
+  void mark_sub_op_sent(const std::string& s) {
     mark_flag_point_string(flag_sub_op_sent, s);
   }
   void mark_commit_sent() {
@@ -169,11 +169,11 @@ public:
 private:
   void set_rmw_flags(int flags);
   void mark_flag_point(uint8_t flag, const char *s);
-  void mark_flag_point_string(uint8_t flag, const string& s);
+  void mark_flag_point_string(uint8_t flag, const std::string& s);
 };
 
 typedef OpRequest::Ref OpRequestRef;
 
-ostream& operator<<(ostream& out, const OpRequest::ClassInfo& i);
+std::ostream& operator<<(std::ostream& out, const OpRequest::ClassInfo& i);
 
 #endif /* OPREQUEST_H_ */
-- 
2.39.5