update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rbd_replay / ActionTypes.h

diff --git a/ceph/src/rbd_replay/ActionTypes.h b/ceph/src/rbd_replay/ActionTypes.h
index b6dc43351e11122d6df876d9883dec1be221fa5e..880b2040201c4b8bc0b3b88a73cf294d4bc2e9a9 100644 (file)
--- a/ceph/src/rbd_replay/ActionTypes.h
+++ b/ceph/src/rbd_replay/ActionTypes.h
@@ -50,8 +50,8 @@ struct Dependency {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(bufferlist::iterator &it);
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(bufferlist::const_iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 
   static void generate_test_instances(std::list<Dependency *> &o);
@@ -89,7 +89,7 @@ struct ActionBase {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -126,7 +126,7 @@ struct ImageActionBase : public ActionBase {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -144,7 +144,7 @@ struct IoActionBase : public ImageActionBase {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -238,7 +238,7 @@ struct OpenImageAction : public ImageActionBase {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -271,7 +271,7 @@ struct AioOpenImageAction : public ImageActionBase {
   }
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -290,7 +290,7 @@ struct UnknownAction {
   static const ActionType ACTION_TYPE = static_cast<ActionType>(-1);
 
   void encode(bufferlist &bl) const;
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 };
 
@@ -318,25 +318,22 @@ public:
   }
 
   void encode(bufferlist &bl) const;
-  void decode(bufferlist::iterator &it);
-  void decode_unversioned(bufferlist::iterator &it);
+  void decode(bufferlist::const_iterator &it);
+  void decode_unversioned(bufferlist::const_iterator &it);
   void dump(Formatter *f) const;
 
   static void generate_test_instances(std::list<ActionEntry *> &o);
 
 private:
-  void decode(__u8 version, bufferlist::iterator &it);
+  void decode(__u8 version, bufferlist::const_iterator &it);
 };
 
 WRITE_CLASS_ENCODER(ActionEntry);
 
-} // namespace action
-} // namespace rbd_replay
-
 std::ostream &operator<<(std::ostream &out,
                          const rbd_replay::action::ActionType &type);
 
-using rbd_replay::action::decode;
-using rbd_replay::action::encode;
+} // namespace action
+} // namespace rbd_replay
 
 #endif // CEPH_RBD_REPLAY_ACTION_TYPES_H