update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / rbd_mirror / leader_watcher / Types.cc

diff --git a/ceph/src/tools/rbd_mirror/leader_watcher/Types.cc b/ceph/src/tools/rbd_mirror/leader_watcher/Types.cc
index 06939443edc0f17e5a6678b3db84eff29950122c..d2fb7908fa4b531c96d29d1c32b7433235d56e93 100644 (file)
--- a/ceph/src/tools/rbd_mirror/leader_watcher/Types.cc
+++ b/ceph/src/tools/rbd_mirror/leader_watcher/Types.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "Types.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/stringify.h"
 #include "common/Formatter.h"
 
@@ -18,7 +18,8 @@ public:
 
   template <typename Payload>
   inline void operator()(const Payload &payload) const {
-    ::encode(static_cast<uint32_t>(Payload::NOTIFY_OP), m_bl);
+    using ceph::encode;
+    encode(static_cast<uint32_t>(Payload::NOTIFY_OP), m_bl);
     payload.encode(m_bl);
   }
 
@@ -28,7 +29,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 Payload>
@@ -38,7 +39,7 @@ public:
 
 private:
   __u8 m_version;
-  bufferlist::iterator &m_iter;
+  bufferlist::const_iterator &m_iter;
 };
 
 class DumpPayloadVisitor : public boost::static_visitor<void> {
@@ -61,7 +62,7 @@ private:
 void HeartbeatPayload::encode(bufferlist &bl) const {
 }
 
-void HeartbeatPayload::decode(__u8 version, bufferlist::iterator &iter) {
+void HeartbeatPayload::decode(__u8 version, bufferlist::const_iterator &iter) {
 }
 
 void HeartbeatPayload::dump(Formatter *f) const {
@@ -70,7 +71,7 @@ void HeartbeatPayload::dump(Formatter *f) const {
 void LockAcquiredPayload::encode(bufferlist &bl) const {
 }
 
-void LockAcquiredPayload::decode(__u8 version, bufferlist::iterator &iter) {
+void LockAcquiredPayload::decode(__u8 version, bufferlist::const_iterator &iter) {
 }
 
 void LockAcquiredPayload::dump(Formatter *f) const {
@@ -79,17 +80,17 @@ void LockAcquiredPayload::dump(Formatter *f) const {
 void LockReleasedPayload::encode(bufferlist &bl) const {
 }
 
-void LockReleasedPayload::decode(__u8 version, bufferlist::iterator &iter) {
+void LockReleasedPayload::decode(__u8 version, bufferlist::const_iterator &iter) {
 }
 
 void LockReleasedPayload::dump(Formatter *f) const {
 }
 
 void UnknownPayload::encode(bufferlist &bl) const {
-  assert(false);
+  ceph_abort();
 }
 
-void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) {
+void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) {
 }
 
 void UnknownPayload::dump(Formatter *f) const {
@@ -101,11 +102,11 @@ void NotifyMessage::encode(bufferlist& bl) const {
   ENCODE_FINISH(bl);
 }
 
-void NotifyMessage::decode(bufferlist::iterator& iter) {
+void NotifyMessage::decode(bufferlist::const_iterator& iter) {
   DECODE_START(1, iter);
 
   uint32_t notify_op;
-  ::decode(notify_op, iter);
+  decode(notify_op, iter);
 
   // select the correct payload variant based upon the encoded op
   switch (notify_op) {