update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/tools/rbd_mirror/instance_watcher/Types.cc b/ceph/src/tools/rbd_mirror/instance_watcher/Types.cc
index 69b84e1580ddc6c4627bfdb3222fc7a74f5d6ab7..0e99227337249604bb98a2a42944c559314b47b6 100644 (file)
--- a/ceph/src/tools/rbd_mirror/instance_watcher/Types.cc
+++ b/ceph/src/tools/rbd_mirror/instance_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> {
@@ -59,11 +60,13 @@ private:
 } // anonymous namespace
 
 void PayloadBase::encode(bufferlist &bl) const {
-  ::encode(request_id, bl);
+  using ceph::encode;
+  encode(request_id, bl);
 }
 
-void PayloadBase::decode(__u8 version, bufferlist::iterator &iter) {
-  ::decode(request_id, iter);
+void PayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) {
+  using ceph::decode;
+  decode(request_id, iter);
 }
 
 void PayloadBase::dump(Formatter *f) const {
@@ -71,13 +74,15 @@ void PayloadBase::dump(Formatter *f) const {
 }
 
 void ImagePayloadBase::encode(bufferlist &bl) const {
+  using ceph::encode;
   PayloadBase::encode(bl);
-  ::encode(global_image_id, bl);
+  encode(global_image_id, bl);
 }
 
-void ImagePayloadBase::decode(__u8 version, bufferlist::iterator &iter) {
+void ImagePayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) {
+  using ceph::decode;
   PayloadBase::decode(version, iter);
-  ::decode(global_image_id, iter);
+  decode(global_image_id, iter);
 }
 
 void ImagePayloadBase::dump(Formatter *f) const {
@@ -86,15 +91,17 @@ void ImagePayloadBase::dump(Formatter *f) const {
 }
 
 void PeerImageRemovedPayload::encode(bufferlist &bl) const {
+  using ceph::encode;
   PayloadBase::encode(bl);
-  ::encode(global_image_id, bl);
-  ::encode(peer_mirror_uuid, bl);
+  encode(global_image_id, bl);
+  encode(peer_mirror_uuid, bl);
 }
 
-void PeerImageRemovedPayload::decode(__u8 version, bufferlist::iterator &iter) {
+void PeerImageRemovedPayload::decode(__u8 version, bufferlist::const_iterator &iter) {
+  using ceph::decode;
   PayloadBase::decode(version, iter);
-  ::decode(global_image_id, iter);
-  ::decode(peer_mirror_uuid, iter);
+  decode(global_image_id, iter);
+  decode(peer_mirror_uuid, iter);
 }
 
 void PeerImageRemovedPayload::dump(Formatter *f) const {
@@ -104,13 +111,15 @@ void PeerImageRemovedPayload::dump(Formatter *f) const {
 }
 
 void SyncPayloadBase::encode(bufferlist &bl) const {
+  using ceph::encode;
   PayloadBase::encode(bl);
-  ::encode(sync_id, bl);
+  encode(sync_id, bl);
 }
 
-void SyncPayloadBase::decode(__u8 version, bufferlist::iterator &iter) {
+void SyncPayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) {
+  using ceph::decode;
   PayloadBase::decode(version, iter);
-  ::decode(sync_id, iter);
+  decode(sync_id, iter);
 }
 
 void SyncPayloadBase::dump(Formatter *f) const {
@@ -119,10 +128,10 @@ void SyncPayloadBase::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 {
@@ -134,11 +143,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(2, 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) {
@@ -212,15 +221,17 @@ std::ostream &operator<<(std::ostream &out, const NotifyOp &op) {
 }
 
 void NotifyAckPayload::encode(bufferlist &bl) const {
-  ::encode(instance_id, bl);
-  ::encode(request_id, bl);
-  ::encode(ret_val, bl);
+  using ceph::encode;
+  encode(instance_id, bl);
+  encode(request_id, bl);
+  encode(ret_val, bl);
 }
 
-void NotifyAckPayload::decode(bufferlist::iterator &iter) {
-  ::decode(instance_id, iter);
-  ::decode(request_id, iter);
-  ::decode(ret_val, iter);
+void NotifyAckPayload::decode(bufferlist::const_iterator &iter) {
+  using ceph::decode;
+  decode(instance_id, iter);
+  decode(request_id, iter);
+  decode(ret_val, iter);
 }
 
 void NotifyAckPayload::dump(Formatter *f) const {