update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/mds/flock.h b/ceph/src/mds/flock.h
index 142e4d12708717dce34ef2873f57d4149f0e5089..ef1793f46aa8cdfe026951614e80055035f89027 100644 (file)
--- a/ceph/src/mds/flock.h
+++ b/ceph/src/mds/flock.h
@@ -251,12 +251,14 @@ private:
 
 public:
   void encode(bufferlist& bl) const {
-    ::encode(held_locks, bl);
-    ::encode(client_held_lock_counts, bl);
+    using ceph::encode;
+    encode(held_locks, bl);
+    encode(client_held_lock_counts, bl);
   }
-  void decode(bufferlist::iterator& bl) {
-    ::decode(held_locks, bl);
-    ::decode(client_held_lock_counts, bl);
+  void decode(bufferlist::const_iterator& bl) {
+    using ceph::decode;
+    decode(held_locks, bl);
+    decode(client_held_lock_counts, bl);
   }
   bool empty() const {
     return held_locks.empty() && waiting_locks.empty() &&