update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mds / JournalPointer.h

diff --git a/ceph/src/mds/JournalPointer.h b/ceph/src/mds/JournalPointer.h
index 62bcba298dcd0c92e41f9f848fab3f7590259058..0f42326605413ce4bf45cec8f0f37b2fefe47c9f 100644 (file)
--- a/ceph/src/mds/JournalPointer.h
+++ b/ceph/src/mds/JournalPointer.h
@@ -40,15 +40,15 @@ class JournalPointer {
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(front, bl);
-    ::encode(back, bl);
+    encode(front, bl);
+    encode(back, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START(1, bl);
-    ::decode(front, bl);
-    ::decode(back, bl);
+    decode(front, bl);
+    decode(back, bl);
     DECODE_FINISH(bl);
   }