import ceph 16.2.6

[ceph.git] / ceph / src / mds / FSMapUser.cc

diff --git a/ceph/src/mds/FSMapUser.cc b/ceph/src/mds/FSMapUser.cc
index 8471708aadca69d18ebd4a2efd8ccf7f7e51ab9d..63a58acc835aa7d07522befcb4de5dbe1273239c 100644 (file)
--- a/ceph/src/mds/FSMapUser.cc
+++ b/ceph/src/mds/FSMapUser.cc
@@ -1,47 +1,47 @@
 #include "FSMapUser.h"
 
-void FSMapUser::encode(bufferlist& bl, uint64_t features) const
+void FSMapUser::encode(ceph::buffer::list& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(epoch, bl);
-  ::encode(legacy_client_fscid, bl);
+  encode(epoch, bl);
+  encode(legacy_client_fscid, bl);
   std::vector<fs_info_t> fs_list;
   for (auto p = filesystems.begin(); p != filesystems.end(); ++p)
     fs_list.push_back(p->second);
-  ::encode(fs_list, bl, features);
+  encode(fs_list, bl, features);
   ENCODE_FINISH(bl);
 }
 
-void FSMapUser::decode(bufferlist::iterator& p)
+void FSMapUser::decode(ceph::buffer::list::const_iterator& p)
 {
   DECODE_START(1, p);
-  ::decode(epoch, p);
-  ::decode(legacy_client_fscid, p);
+  decode(epoch, p);
+  decode(legacy_client_fscid, p);
   std::vector<fs_info_t> fs_list;
-  ::decode(fs_list, p);
+  decode(fs_list, p);
   filesystems.clear();
   for (auto p = fs_list.begin(); p != fs_list.end(); ++p)
     filesystems[p->cid] = *p;
   DECODE_FINISH(p);
 }
 
-void FSMapUser::fs_info_t::encode(bufferlist& bl, uint64_t features) const
+void FSMapUser::fs_info_t::encode(ceph::buffer::list& bl, uint64_t features) const
 {
   ENCODE_START(1, 1, bl);
-  ::encode(cid, bl);
-  ::encode(name, bl);
+  encode(cid, bl);
+  encode(name, bl);
   ENCODE_FINISH(bl);
 }
 
-void FSMapUser::fs_info_t::decode(bufferlist::iterator& p)
+void FSMapUser::fs_info_t::decode(ceph::buffer::list::const_iterator& p)
 {
   DECODE_START(1, p);
-  ::decode(cid, p);
-  ::decode(name, p);
+  decode(cid, p);
+  decode(name, p);
   DECODE_FINISH(p);
 }
 
-void FSMapUser::generate_test_instances(list<FSMapUser*>& ls)
+void FSMapUser::generate_test_instances(std::list<FSMapUser*>& ls)
 {
   FSMapUser *m = new FSMapUser();
   m->epoch = 2;
@@ -54,7 +54,7 @@ void FSMapUser::generate_test_instances(list<FSMapUser*>& ls)
 }
 
 
-void FSMapUser::print(ostream& out) const
+void FSMapUser::print(std::ostream& out) const
 {
   out << "e" << epoch << std::endl;
   out << "legacy_client_fscid: " << legacy_client_fscid << std::endl;
@@ -62,10 +62,10 @@ void FSMapUser::print(ostream& out) const
     out << " id " <<  p.second.cid << " name " << p.second.name << std::endl;
 }
 
-void FSMapUser::print_summary(Formatter *f, ostream *out)
+void FSMapUser::print_summary(ceph::Formatter *f, std::ostream *out)
 {
-  map<mds_role_t,string> by_rank;
-  map<string,int> by_state;
+  std::map<mds_role_t,std::string> by_rank;
+  std::map<std::string,int> by_state;
 
   if (f) {
     f->dump_unsigned("epoch", get_epoch());