update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / os / filestore / SequencerPosition.h

diff --git a/ceph/src/os/filestore/SequencerPosition.h b/ceph/src/os/filestore/SequencerPosition.h
index c2ecf853bcf32ecca137b88eb1765fafab52ff24..164112eebf852ad41962595b90ba1f7b9a913eb0 100644 (file)
--- a/ceph/src/os/filestore/SequencerPosition.h
+++ b/ceph/src/os/filestore/SequencerPosition.h
@@ -23,16 +23,16 @@ struct SequencerPosition {
 
   void encode(bufferlist& bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(seq, bl);
-    ::encode(trans, bl);
-    ::encode(op, bl);
+    encode(seq, bl);
+    encode(trans, bl);
+    encode(op, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator& p) {
+  void decode(bufferlist::const_iterator& p) {
     DECODE_START(1, p);
-    ::decode(seq, p);
-    ::decode(trans, p);
-    ::decode(op, p);
+    decode(seq, p);
+    decode(trans, p);
+    decode(op, p);
     DECODE_FINISH(p);
   }
   void dump(Formatter *f) const {