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

index cc7a15fce5f714aefc5ddcded9f44bfa395889f8..9ea4035583e9314df3c0ff2ce740e6c414d5825d 100644 (file)
@@ -21,12 +21,12 @@ class MMonCommandAck : public MessageInstance<MMonCommandAck, PaxosServiceMessag
 public:
   friend factory;
 
-  vector<string> cmd;
+  std::vector<std::string> cmd;
   errorcode32_t r;
-  string rs;
-  
+  std::string rs;
+
   MMonCommandAck() : MessageInstance(MSG_MON_COMMAND_ACK, 0) {}
-  MMonCommandAck(vector<string>& c, int _r, string s, version_t v) : 
+  MMonCommandAck(std::vector<std::string>& c, int _r, std::string s, version_t v) : 
     MessageInstance(MSG_MON_COMMAND_ACK, v),
     cmd(c), r(_r), rs(s) { }
 private:
@@ -34,7 +34,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "mon_command"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "mon_command_ack(" << cmd << "=" << r << " " << rs << " v" << version << ")";
   }
   
@@ -46,6 +46,7 @@ public:
     encode(cmd, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(r, p);