update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / os / filestore / SequencerPosition.h

diff --git a/ceph/src/os/filestore/SequencerPosition.h b/ceph/src/os/filestore/SequencerPosition.h
index 164112eebf852ad41962595b90ba1f7b9a913eb0..789854317f280648848b25d5bc8ebb9a1b4a6b46 100644 (file)
--- a/ceph/src/os/filestore/SequencerPosition.h
+++ b/ceph/src/os/filestore/SequencerPosition.h
@@ -21,26 +21,26 @@ struct SequencerPosition {
 
   SequencerPosition(uint64_t s=0, int32_t t=0, int32_t o=0) : seq(s), trans(t), op(o) {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(seq, bl);
     encode(trans, bl);
     encode(op, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::const_iterator& p) {
+  void decode(ceph::buffer::list::const_iterator& p) {
     DECODE_START(1, p);
     decode(seq, p);
     decode(trans, p);
     decode(op, p);
     DECODE_FINISH(p);
   }
-  void dump(Formatter *f) const {
+  void dump(ceph::Formatter *f) const {
     f->dump_unsigned("seq", seq);
     f->dump_unsigned("trans", trans);
     f->dump_unsigned("op", op);
   }
-  static void generate_test_instances(list<SequencerPosition*>& o) {
+  static void generate_test_instances(std::list<SequencerPosition*>& o) {
     o.push_back(new SequencerPosition);
     o.push_back(new SequencerPosition(1, 2, 3));
     o.push_back(new SequencerPosition(4, 5, 6));
@@ -48,7 +48,7 @@ struct SequencerPosition {
 };
 WRITE_CLASS_ENCODER(SequencerPosition)
 
-inline ostream& operator<<(ostream& out, const SequencerPosition& t) {
+inline std::ostream& operator<<(std::ostream& out, const SequencerPosition& t) {
   return out << t.seq << "." << t.trans << "." << t.op;
 }