From ef059584e78c99676c14b3452637d42b5ba4be51 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 20:47:12 -0400
Subject: [PATCH] messages: Update MOSDOpReply.h to work without using
 namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/messages/MOSDOpReply.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 3649921e63e57..f14bd35e093a4 100644
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -38,7 +38,7 @@ private:
 
   object_t oid;
   pg_t pgid;
-  vector<OSDOp> ops;
+  std::vector<OSDOp> ops;
   bool bdata_encode;
   int64_t flags = 0;
   errorcode32_t result;
@@ -98,13 +98,13 @@ public:
 
   void add_flags(int f) { flags |= f; }
 
-  void claim_op_out_data(vector<OSDOp>& o) {
+  void claim_op_out_data(std::vector<OSDOp>& o) {
     ceph_assert(ops.size() == o.size());
     for (unsigned i = 0; i < o.size(); i++) {
       ops[i].outdata.claim(o[i].outdata);
     }
   }
-  void claim_ops(vector<OSDOp>& o) {
+  void claim_ops(std::vector<OSDOp>& o) {
     o.swap(ops);
     bdata_encode = false;
   }
@@ -180,7 +180,7 @@ public:
       for (unsigned i = 0; i < head.num_ops; i++) {
 	encode(ops[i].op, payload);
       }
-      encode_nohead(oid.name, payload);
+      ceph::encode_nohead(oid.name, payload);
     } else {
       header.version = HEAD_VERSION;
       encode(oid, payload);
@@ -253,7 +253,7 @@ public:
       for (unsigned i = 0; i < head.num_ops; i++) {
 	decode(ops[i].op, p);
       }
-      decode_nohead(head.object_len, oid.name, p);
+      ceph::decode_nohead(head.object_len, oid.name, p);
       pgid = pg_t(head.layout.ol_pgid);
       result = (int32_t)head.result;
       flags = head.flags;
@@ -312,8 +312,8 @@ public:
   }
 
   std::string_view get_type_name() const override { return "osd_op_reply"; }
-  
-  void print(ostream& out) const override {
+
+  void print(std::ostream& out) const override {
     out << "osd_op_reply(" << get_tid()
 	<< " " << oid << " " << ops
 	<< " v" << get_replay_version()
-- 
2.39.5