update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rgw / rgw_sync_log_trim.h

diff --git a/ceph/src/rgw/rgw_sync_log_trim.h b/ceph/src/rgw/rgw_sync_log_trim.h
index 3d61b08dc1bcc8483b663ba51734db7b09f5b743..13d1f63a1cf433e03b38001940658f1b098e8c76 100644 (file)
--- a/ceph/src/rgw/rgw_sync_log_trim.h
+++ b/ceph/src/rgw/rgw_sync_log_trim.h
@@ -1,5 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
+
 /*
  * Ceph - scalable distributed file system
  *
@@ -90,12 +91,12 @@ struct BucketTrimStatus {
 
   void encode(bufferlist& bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(marker, bl);
+    encode(marker, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator& p) {
+  void decode(bufferlist::const_iterator& p) {
     DECODE_START(1, p);
-    ::decode(marker, p);
+    decode(marker, p);
     DECODE_FINISH(p);
   }