update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / librbd / watcher / Utils.h

diff --git a/ceph/src/librbd/watcher/Utils.h b/ceph/src/librbd/watcher/Utils.h
index 78966d6a58a1be25fe6ddfc0c5c9df339468dcf0..d2510aaf36cabbbe5d527b8174377ef147a38a30 100644 (file)
--- a/ceph/src/librbd/watcher/Utils.h
+++ b/ceph/src/librbd/watcher/Utils.h
@@ -43,7 +43,8 @@ public:
 
   template <typename P>
   inline void operator()(const P &payload) const {
-    ::encode(static_cast<uint32_t>(P::NOTIFY_OP), m_bl);
+    using ceph::encode;
+    encode(static_cast<uint32_t>(P::NOTIFY_OP), m_bl);
     payload.encode(m_bl);
   }
 
@@ -53,7 +54,7 @@ private:
 
 class DecodePayloadVisitor : public boost::static_visitor<void> {
 public:
-  DecodePayloadVisitor(__u8 version, bufferlist::iterator &iter)
+  DecodePayloadVisitor(__u8 version, bufferlist::const_iterator &iter)
     : m_version(version), m_iter(iter) {}
 
   template <typename P>
@@ -63,7 +64,7 @@ public:
 
 private:
   __u8 m_version;
-  bufferlist::iterator &m_iter;
+  bufferlist::const_iterator &m_iter;
 };
 
 } // namespace util