update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / cls / refcount / cls_refcount_ops.h

diff --git a/ceph/src/cls/refcount/cls_refcount_ops.h b/ceph/src/cls/refcount/cls_refcount_ops.h
index 946c11aa30bb18ac8987c4f1b99b7f6652e31dcb..5d60b161fd5ab1b1a4e87281dc0b02e7c3a68200 100644 (file)
--- a/ceph/src/cls/refcount/cls_refcount_ops.h
+++ b/ceph/src/cls/refcount/cls_refcount_ops.h
@@ -8,44 +8,44 @@
 #include "common/hobject.h"
 
 struct cls_refcount_get_op {
-  string tag;
+  std::string tag;
   bool implicit_ref;
 
   cls_refcount_get_op() : implicit_ref(false) {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(tag, bl);
     encode(implicit_ref, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(1, bl);
     decode(tag, bl);
     decode(implicit_ref, bl);
     DECODE_FINISH(bl);
   }
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<cls_refcount_get_op*>& ls);
+  static void generate_test_instances(std::list<cls_refcount_get_op*>& ls);
 };
 WRITE_CLASS_ENCODER(cls_refcount_get_op)
 
 struct cls_refcount_put_op {
-  string tag;
+  std::string tag;
   bool implicit_ref; // assume wildcard reference for
-                          // objects without a set ref
+                          // objects without a std::set ref
 
   cls_refcount_put_op() : implicit_ref(false) {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(tag, bl);
     encode(implicit_ref, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(1, bl);
     decode(tag, bl);
     decode(implicit_ref, bl);
@@ -53,91 +53,91 @@ struct cls_refcount_put_op {
   }
 
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<cls_refcount_put_op*>& ls);
+  static void generate_test_instances(std::list<cls_refcount_put_op*>& ls);
 };
 WRITE_CLASS_ENCODER(cls_refcount_put_op)
 
 struct cls_refcount_set_op {
-  list<string> refs;
+  std::list<std::string> refs;
 
   cls_refcount_set_op() {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(refs, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(1, bl);
     decode(refs, bl);
     DECODE_FINISH(bl);
   }
 
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<cls_refcount_set_op*>& ls);
+  static void generate_test_instances(std::list<cls_refcount_set_op*>& ls);
 };
 WRITE_CLASS_ENCODER(cls_refcount_set_op)
 
 struct cls_refcount_read_op {
   bool implicit_ref; // assume wildcard reference for
-                          // objects without a set ref
+                          // objects without a std::set ref
 
   cls_refcount_read_op() : implicit_ref(false) {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(implicit_ref, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(1, bl);
     decode(implicit_ref, bl);
     DECODE_FINISH(bl);
   }
 
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<cls_refcount_read_op*>& ls);
+  static void generate_test_instances(std::list<cls_refcount_read_op*>& ls);
 };
 WRITE_CLASS_ENCODER(cls_refcount_read_op)
 
 struct cls_refcount_read_ret {
-  list<string> refs;
+  std::list<std::string> refs;
 
   cls_refcount_read_ret() {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(1, 1, bl);
     encode(refs, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(1, bl);
     decode(refs, bl);
     DECODE_FINISH(bl);
   }
 
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<cls_refcount_read_ret*>& ls);
+  static void generate_test_instances(std::list<cls_refcount_read_ret*>& ls);
 };
 WRITE_CLASS_ENCODER(cls_refcount_read_ret)
 
 struct obj_refcount {
-  map<string, bool> refs;
-  set<string> retired_refs;
+  std::map<std::string, bool> refs;
+  std::set<std::string> retired_refs;
 
   obj_refcount() {}
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     ENCODE_START(2, 1, bl);
     encode(refs, bl);
     encode(retired_refs, bl);
     ENCODE_FINISH(bl);
   }
 
-  void decode(bufferlist::const_iterator& bl) {
+  void decode(ceph::buffer::list::const_iterator& bl) {
     DECODE_START(2, bl);
     decode(refs, bl);
     if (struct_v >= 2) {
@@ -147,7 +147,7 @@ struct obj_refcount {
   }
 
   void dump(ceph::Formatter *f) const;
-  static void generate_test_instances(list<obj_refcount*>& ls);
+  static void generate_test_instances(std::list<obj_refcount*>& ls);
 };
 WRITE_CLASS_ENCODER(obj_refcount)