update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/rgw/rgw_token.h b/ceph/src/rgw/rgw_token.h
index 9235f54b8416bb9f580dab859662ae650e1ffa9f..8f50133d91c0766d5f27f459bb9b1938baeebc8d 100644 (file)
--- a/ceph/src/rgw/rgw_token.h
+++ b/ceph/src/rgw/rgw_token.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
  *
@@ -93,25 +94,25 @@ namespace rgw {
       uint32_t ver = version();
       string typestr{from_type(type)};
       ENCODE_START(1, 1, bl);
-      ::encode(type_name, bl);
-      ::encode(ver, bl);
-      ::encode(typestr, bl);
-      ::encode(id, bl);
-      ::encode(key, bl);
+      encode(type_name, bl);
+      encode(ver, bl);
+      encode(typestr, bl);
+      encode(id, bl);
+      encode(key, bl);
       ENCODE_FINISH(bl);
     }
 
-    void decode(bufferlist::iterator& bl) {
+    void decode(bufferlist::const_iterator& bl) {
       string name;
       string typestr;
       uint32_t version;
       DECODE_START(1, bl);
-      ::decode(name, bl);
-      ::decode(version, bl);
-      ::decode(typestr, bl);
+      decode(name, bl);
+      decode(version, bl);
+      decode(typestr, bl);
       type = to_type(typestr);
-      ::decode(id, bl);
-      ::decode(key, bl);
+      decode(id, bl);
+      decode(key, bl);
       DECODE_FINISH(bl);
     }