update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MPGStatsAck.h b/ceph/src/messages/MPGStatsAck.h
index 5afbab580dd1f0c41f8bc475f56008eae1f5e399..03bade32bfe4eae19a7fb21a459ec86269069b43 100644 (file)
--- a/ceph/src/messages/MPGStatsAck.h
+++ b/ceph/src/messages/MPGStatsAck.h
@@ -17,18 +17,18 @@
 
 #include "osd/osd_types.h"
 
-class MPGStatsAck : public Message {
+class MPGStatsAck final : public Message {
 public:
-  map<pg_t,pair<version_t,epoch_t> > pg_stat;
-  
+  std::map<pg_t,std::pair<version_t,epoch_t> > pg_stat;
+
   MPGStatsAck() : Message{MSG_PGSTATSACK} {}
 
 private:
-  ~MPGStatsAck() override {}
+  ~MPGStatsAck() final {}
 
 public:
   std::string_view get_type_name() const override { return "pg_stats_ack"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "pg_stats_ack(" << pg_stat.size() << " pgs tid " << get_tid() << ")";
   }
 
@@ -37,6 +37,7 @@ public:
     encode(pg_stat, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(pg_stat, p);
   }