journal: Update cls_journal_types.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/cls/journal/cls_journal_types.h b/src/cls/journal/cls_journal_types.h
index 2a6176983dbab0788949db70245f5b20791f1aaa..705936a06d0457386ba4692dd4badac54996ddc7 100644 (file)
--- 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<Client *> &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<Tag *> &o);
 };