]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
messages: Update MOSDOpRepOp.h to work without using namespace
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 00:47:26 +0000 (20:47 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 14:30:35 +0000 (10:30 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/messages/MOSDRepOp.h

index 9d087f391e6351572475a4964553ca7ddeaebc41..94fca67b0041beafb3abd75874ca634ea47ec246 100644 (file)
@@ -37,7 +37,7 @@ public:
 
   spg_t pgid;
 
-  bufferlist::const_iterator p;
+  ceph::buffer::list::const_iterator p;
   // Decoding flags. Decoding is only needed for messages caught by pipe reader.
   bool final_decode_needed;
 
@@ -48,7 +48,7 @@ public:
   __u8 acks_wanted;
 
   // transaction to exec
-  bufferlist logbl;
+  ceph::buffer::list logbl;
   pg_stat_t pg_stats;
 
   // subop metadata
@@ -80,6 +80,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     p = payload.cbegin();
     // split to partial and final
     decode(map_epoch, p);
@@ -94,6 +95,7 @@ public:
   }
 
   void finish_decode() {
+    using ceph::decode;
     if (!final_decode_needed)
       return; // Message is already final decoded
     decode(poid, p);
@@ -164,7 +166,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "osd_repop"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "osd_repop(" << reqid
        << " " << pgid << " e" << map_epoch << "/" << min_epoch;
     if (!final_decode_needed) {