update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / cls / journal / cls_journal_types.h

diff --git a/ceph/src/cls/journal/cls_journal_types.h b/ceph/src/cls/journal/cls_journal_types.h
index f2cb841973f4327a7ed95a6208ea94d7b10bc688..2a6176983dbab0788949db70245f5b20791f1aaa 100644 (file)
--- a/ceph/src/cls/journal/cls_journal_types.h
+++ b/ceph/src/cls/journal/cls_journal_types.h
@@ -37,7 +37,7 @@ struct ObjectPosition {
   }
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& iter);
+  void decode(bufferlist::const_iterator& iter);
   void dump(Formatter *f) const;
 
   inline bool operator<(const ObjectPosition &rhs) const {
@@ -63,7 +63,7 @@ struct ObjectSetPosition {
     : object_positions(_object_positions) {}
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& iter);
+  void decode(bufferlist::const_iterator& iter);
   void dump(Formatter *f) const;
 
   inline bool operator==(const ObjectSetPosition &rhs) const {
@@ -101,7 +101,7 @@ struct Client {
   }
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& iter);
+  void decode(bufferlist::const_iterator& iter);
   void dump(Formatter *f) const;
 
   static void generate_test_instances(std::list<Client *> &o);
@@ -128,7 +128,7 @@ struct Tag {
   }
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& iter);
+  void decode(bufferlist::const_iterator& iter);
   void dump(Formatter *f) const;
 
   static void generate_test_instances(std::list<Tag *> &o);
@@ -151,7 +151,4 @@ std::ostream &operator<<(std::ostream &os, const Tag &tag);
 } // namespace journal
 } // namespace cls
 
-using cls::journal::encode;
-using cls::journal::decode;
-
 #endif // CEPH_CLS_JOURNAL_TYPES_H