From 478cc07d42cb43ffabdd6124d96dad573ab92127 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:43:32 -0400 Subject: [PATCH] messages: Update PaxosServiceMessage.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/PaxosServiceMessage.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h index 5b0b1bf5afb..1cdb7a3c01b 100644 --- a/src/messages/PaxosServiceMessage.h +++ b/src/messages/PaxosServiceMessage.h @@ -1,7 +1,10 @@ +// -*- 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 "msg/MessageRef.h" #include "mon/Session.h" class PaxosServiceMessage : public MessageSubType { @@ -13,7 +16,7 @@ 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), version(0), deprecated_session_mon(-1), deprecated_session_mon_tid(0), @@ -33,7 +36,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); -- 2.39.5