From 6dc7ee95b7276cfa29aada3a9f00cca293a73ed9 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 21:51:44 -0400 Subject: [PATCH] journal: Update cls_journal_types.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/cls/journal/cls_journal_types.h | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/cls/journal/cls_journal_types.h b/src/cls/journal/cls_journal_types.h index 2a6176983db..705936a06d0 100644 --- a/src/cls/journal/cls_journal_types.h +++ b/src/cls/journal/cls_journal_types.h @@ -36,9 +36,9 @@ struct ObjectPosition { entry_tid == rhs.entry_tid); } - void encode(bufferlist& bl) const; - void decode(bufferlist::const_iterator& iter); - void dump(Formatter *f) const; + void encode(ceph::buffer::list& bl) const; + void decode(ceph::buffer::list::const_iterator& iter); + void dump(ceph::Formatter *f) const; inline bool operator<(const ObjectPosition &rhs) const { if (object_number != rhs.object_number) { @@ -62,9 +62,9 @@ struct ObjectSetPosition { ObjectSetPosition(const ObjectPositions &_object_positions) : object_positions(_object_positions) {} - void encode(bufferlist& bl) const; - void decode(bufferlist::const_iterator& iter); - void dump(Formatter *f) const; + void encode(ceph::buffer::list& bl) const; + void decode(ceph::buffer::list::const_iterator& iter); + void dump(ceph::Formatter *f) const; inline bool operator==(const ObjectSetPosition &rhs) const { return (object_positions == rhs.object_positions); @@ -80,12 +80,12 @@ enum ClientState { struct Client { std::string id; - bufferlist data; + ceph::buffer::list data; ObjectSetPosition commit_position; ClientState state; Client() : state(CLIENT_STATE_CONNECTED) {} - Client(const std::string& _id, const bufferlist &_data, + Client(const std::string& _id, const ceph::buffer::list &_data, const ObjectSetPosition &_commit_position = ObjectSetPosition(), ClientState _state = CLIENT_STATE_CONNECTED) : id(_id), data(_data), commit_position(_commit_position), state(_state) {} @@ -100,9 +100,9 @@ struct Client { return (id < rhs.id); } - void encode(bufferlist& bl) const; - void decode(bufferlist::const_iterator& iter); - void dump(Formatter *f) const; + void encode(ceph::buffer::list& bl) const; + void decode(ceph::buffer::list::const_iterator& iter); + void dump(ceph::Formatter *f) const; static void generate_test_instances(std::list &o); }; @@ -112,10 +112,10 @@ struct Tag { uint64_t tid; uint64_t tag_class; - bufferlist data; + ceph::buffer::list data; Tag() : tid(0), tag_class(0) {} - Tag(uint64_t tid, uint64_t tag_class, const bufferlist &data) + Tag(uint64_t tid, uint64_t tag_class, const ceph::buffer::list &data) : tid(tid), tag_class(tag_class), data(data) {} inline bool operator==(const Tag &rhs) const { @@ -127,9 +127,9 @@ struct Tag { return (tid < rhs.tid); } - void encode(bufferlist& bl) const; - void decode(bufferlist::const_iterator& iter); - void dump(Formatter *f) const; + void encode(ceph::buffer::list& bl) const; + void decode(ceph::buffer::list::const_iterator& iter); + void dump(ceph::Formatter *f) const; static void generate_test_instances(std::list &o); }; -- 2.39.5