update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / messages / MMonScrub.h

diff --git a/ceph/src/messages/MMonScrub.h b/ceph/src/messages/MMonScrub.h
index 967588fd2620ae082345c44ac0294334fc99f4af..b3b99b43fd406d76ed16c217799f3ec3eb11c329 100644 (file)
--- a/ceph/src/messages/MMonScrub.h
+++ b/ceph/src/messages/MMonScrub.h
@@ -39,7 +39,7 @@ public:
   version_t version = 0;
   ScrubResult result;
   int32_t num_keys;
-  pair<string,string> key;
+  std::pair<std::string,std::string> key;
 
   MMonScrub()
     : Message{MSG_MON_SCRUB, HEAD_VERSION, COMPAT_VERSION},
@@ -53,7 +53,7 @@ public:
 
   std::string_view get_type_name() const override { return "mon_scrub"; }
 
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "mon_scrub(" << get_opname((op_type_t)op);
     out << " v " << version;
     if (op == OP_RESULT)
@@ -74,6 +74,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     uint8_t o;
     decode(o, p);