update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDPGTemp.h b/ceph/src/messages/MOSDPGTemp.h
index 3a247bd090c263c9301ad29c974f90cfbb8db6e3..d73a767b7b384c91ce43a6cb84a1eab1d2ba87e2 100644 (file)
--- a/ceph/src/messages/MOSDPGTemp.h
+++ b/ceph/src/messages/MOSDPGTemp.h
@@ -19,10 +19,10 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDPGTemp : public PaxosServiceMessage {
+class MOSDPGTemp final : public PaxosServiceMessage {
 public:
   epoch_t map_epoch = 0;
-  map<pg_t, vector<int32_t> > pg_temp;
+  std::map<pg_t, std::vector<int32_t> > pg_temp;
   bool forced = false;
 
   MOSDPGTemp(epoch_t e)
@@ -33,7 +33,7 @@ public:
     : MOSDPGTemp(0)
   {}
 private:
-  ~MOSDPGTemp() override {}
+  ~MOSDPGTemp() final {}
 
 public:
   void encode_payload(uint64_t features) override {
@@ -44,6 +44,7 @@ public:
     encode(forced, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(map_epoch, p);
@@ -54,7 +55,7 @@ public:
   }
 
   std::string_view get_type_name() const override { return "osd_pgtemp"; }
-  void print(ostream &out) const override {
+  void print(std::ostream &out) const override {
     out << "osd_pgtemp(e" << map_epoch << " " << pg_temp << " v" << version << ")";
   }
 private: