update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDPGBackfillRemove.h b/ceph/src/messages/MOSDPGBackfillRemove.h
index 5c70c386f3d4adbb1f6dbe8405829151696fbe2f..6029024ee7c4648b4d13e8dd9dc8dc48c4e93def 100644 (file)
--- a/ceph/src/messages/MOSDPGBackfillRemove.h
+++ b/ceph/src/messages/MOSDPGBackfillRemove.h
@@ -21,14 +21,14 @@
  * instruct non-primary to remove some objects during backfill
  */
 
-class MOSDPGBackfillRemove : public MOSDFastDispatchOp {
+class MOSDPGBackfillRemove final : public MOSDFastDispatchOp {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
   spg_t pgid;            ///< target spg_t
   epoch_t map_epoch = 0;
-  list<pair<hobject_t,eversion_t>> ls;    ///< objects to remove
+  std::list<std::pair<hobject_t,eversion_t>> ls;    ///< objects to remove
 
   epoch_t get_map_epoch() const override {
     return map_epoch;
@@ -49,11 +49,11 @@ public:
       map_epoch(map_epoch) {}
 
 private:
-  ~MOSDPGBackfillRemove() {}
+  ~MOSDPGBackfillRemove() final {}
 
 public:
   std::string_view get_type_name() const override { return "backfill_remove"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "backfill_remove(" << pgid << " e" << map_epoch
        << " " << ls << ")";
   }
@@ -65,6 +65,7 @@ public:
     encode(ls, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(pgid, p);
     decode(map_epoch, p);