import 15.2.0 Octopus source

[ceph.git] / ceph / src / messages / PaxosServiceMessage.h

diff --git a/ceph/src/messages/PaxosServiceMessage.h b/ceph/src/messages/PaxosServiceMessage.h
index 5b0b1bf5afbb99202113737977db33e5fd1b8004..8bdad564dfa5ace36d7aaf3ee3d983599707819d 100644 (file)
--- a/ceph/src/messages/PaxosServiceMessage.h
+++ b/ceph/src/messages/PaxosServiceMessage.h
@@ -1,10 +1,12 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+
 #ifndef CEPH_PAXOSSERVICEMESSAGE_H
 #define CEPH_PAXOSSERVICEMESSAGE_H
 
 #include "msg/Message.h"
 #include "mon/Session.h"
 
-class PaxosServiceMessage : public MessageSubType<PaxosServiceMessage> {
+class PaxosServiceMessage : public Message {
 public:
   version_t version;
   __s16 deprecated_session_mon;
@@ -13,13 +15,13 @@ public:
   // track which epoch the leader received a forwarded request in, so we can
   // discard forwarded requests appropriately on election boundaries.
   epoch_t rx_election_epoch;
-  
+
   PaxosServiceMessage()
-    : MessageSubType(MSG_PAXOS),
+    : Message{MSG_PAXOS},
       version(0), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0) { }
   PaxosServiceMessage(int type, version_t v, int enc_version=1, int compat_enc_version=0)
-    : MessageSubType(type, enc_version, compat_enc_version),
+    : Message{type, enc_version, compat_enc_version},
       version(v), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0)  { }
  protected:
@@ -33,7 +35,8 @@ public:
     encode(deprecated_session_mon_tid, payload);
   }
 
-  void paxos_decode(bufferlist::const_iterator& p ) {
+  void paxos_decode(ceph::buffer::list::const_iterator& p ) {
+    using ceph::decode;
     decode(version, p);
     decode(deprecated_session_mon, p);
     decode(deprecated_session_mon_tid, p);