mds: list to std::list

Cleaning up namespaces.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/Anchor.cc b/src/mds/Anchor.cc
index 02cc2d2b46c40a957df2f31dd12738d14c247c83..0acc2c2f6590044500aebf2334bb47fc33039e5d 100644 (file)
--- a/src/mds/Anchor.cc
+++ b/src/mds/Anchor.cc
@@ -44,7 +44,7 @@ void Anchor::dump(Formatter *f) const
   f->dump_unsigned("d_type", d_type);
 }
 
-void Anchor::generate_test_instances(list<Anchor*>& ls)
+void Anchor::generate_test_instances(std::list<Anchor*>& ls)
 {
   ls.push_back(new Anchor);
   ls.push_back(new Anchor);

diff --git a/src/mds/Anchor.h b/src/mds/Anchor.h
index 49b592b9f0e777b633658a53705f2d6c7f7bfb0e..e05a6298d7c9e572228d81624f3f0dbe7bb9267b 100644 (file)
--- a/src/mds/Anchor.h
+++ b/src/mds/Anchor.h
@@ -42,7 +42,7 @@ public:
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<Anchor*>& ls);
+  static void generate_test_instances(std::list<Anchor*>& ls);
 };
 WRITE_CLASS_ENCODER(Anchor)
 

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 178533abf939cefc8edad1778c7400dbf361f1af..c929e937db0cfdee8513435223f10052333e6029 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -4049,7 +4049,7 @@ void InodeStoreBase::dump(Formatter *f) const
 }
 
 
-void InodeStore::generate_test_instances(list<InodeStore*> &ls)
+void InodeStore::generate_test_instances(std::list<InodeStore*> &ls)
 {
   InodeStore *populated = new InodeStore;
   populated->inode.ino = 0xdeadbeef;
@@ -4057,7 +4057,7 @@ void InodeStore::generate_test_instances(list<InodeStore*> &ls)
   ls.push_back(populated);
 }
 
-void InodeStoreBare::generate_test_instances(list<InodeStoreBare*> &ls)
+void InodeStoreBare::generate_test_instances(std::list<InodeStoreBare*> &ls)
 {
   InodeStoreBare *populated = new InodeStoreBare;
   populated->inode.ino = 0xdeadbeef;

diff --git a/src/mds/Capability.cc b/src/mds/Capability.cc
index eadbd5cdff883544f77bd1960543b676064df988..6cc1c331766defa387de67d9c5ea1cf380bc7d6a 100644 (file)
--- a/src/mds/Capability.cc
+++ b/src/mds/Capability.cc
@@ -63,7 +63,7 @@ void Capability::Export::dump(Formatter *f) const
   f->dump_stream("last_issue_stamp") << last_issue_stamp;
 }
 
-void Capability::Export::generate_test_instances(list<Capability::Export*>& ls)
+void Capability::Export::generate_test_instances(std::list<Capability::Export*>& ls)
 {
   ls.push_back(new Export);
   ls.push_back(new Export);
@@ -129,7 +129,7 @@ void Capability::revoke_info::dump(Formatter *f) const
   f->dump_unsigned("last_issue", last_issue);
 }
 
-void Capability::revoke_info::generate_test_instances(list<Capability::revoke_info*>& ls)
+void Capability::revoke_info::generate_test_instances(std::list<Capability::revoke_info*>& ls)
 {
   ls.push_back(new revoke_info);
   ls.push_back(new revoke_info);
@@ -271,7 +271,7 @@ void Capability::dump(Formatter *f) const
   f->close_section();
 }
 
-void Capability::generate_test_instances(list<Capability*>& ls)
+void Capability::generate_test_instances(std::list<Capability*>& ls)
 {
   ls.push_back(new Capability);
   ls.push_back(new Capability);

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 38681d95becc908ff16e2d03c9a6337a147088e6..24757e120c21d4b57bf9da4a84acf4c41b434b1b 100644 (file)
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -87,7 +87,7 @@ public:
     void encode(bufferlist &bl) const;
     void decode(bufferlist::const_iterator &p);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<Export*>& ls);
+    static void generate_test_instances(std::list<Export*>& ls);
   };
   struct Import {
     int64_t cap_id;
@@ -107,7 +107,7 @@ public:
     void encode(bufferlist& bl) const;
     void decode(bufferlist::const_iterator& bl);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<revoke_info*>& ls);
+    static void generate_test_instances(std::list<revoke_info*>& ls);
   };
 
   const static unsigned STATE_NOTABLE          = (1<<0);
@@ -333,7 +333,7 @@ public:
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<Capability*>& ls);
+  static void generate_test_instances(std::list<Capability*>& ls);
   
   snapid_t client_follows;
   version_t client_xattr_version;

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index e395f2dcbcc8ef3a691d8dc526839ed499acb3fb..59a34fda696ac4345a03656b7747b22c0e7df45e 100644 (file)
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -69,7 +69,7 @@ void FSMap::dump(Formatter *f) const
   f->close_section();
 }
 
-void FSMap::generate_test_instances(list<FSMap*>& ls)
+void FSMap::generate_test_instances(std::list<FSMap*>& ls)
 {
   FSMap *m = new FSMap();
 

diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h
index 199b2cf8d14875bb4f43fca0ef5820fd4880ce40..99bf3736bbf3755678e351a83365f20cb5ac66c1 100644 (file)
--- a/src/mds/FSMap.h
+++ b/src/mds/FSMap.h
@@ -485,7 +485,7 @@ public:
   void print_summary(Formatter *f, ostream *out) const;
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<FSMap*>& ls);
+  static void generate_test_instances(std::list<FSMap*>& ls);
 };
 WRITE_CLASS_ENCODER_FEATURES(FSMap)
 

diff --git a/src/mds/FSMapUser.cc b/src/mds/FSMapUser.cc
index 47d5f19c76b3bf210ec4aa87fc762da9948a15de..2463019d8d25af8e25c8b2d3f43167db64222a2d 100644 (file)
--- a/src/mds/FSMapUser.cc
+++ b/src/mds/FSMapUser.cc
@@ -41,7 +41,7 @@ void FSMapUser::fs_info_t::decode(bufferlist::const_iterator& 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;

diff --git a/src/mds/FSMapUser.h b/src/mds/FSMapUser.h
index 23af84731a6ef2ddea0ab1eb13fca8282b9e7228..c02e3d53aa8b4216d3ff9af7661d89b72e177a92 100644 (file)
--- a/src/mds/FSMapUser.h
+++ b/src/mds/FSMapUser.h
@@ -53,7 +53,7 @@ public:
   void print(ostream& out) const;
   void print_summary(Formatter *f, ostream *out);
 
-  static void generate_test_instances(list<FSMapUser*>& ls);
+  static void generate_test_instances(std::list<FSMapUser*>& ls);
 };
 WRITE_CLASS_ENCODER_FEATURES(FSMapUser::fs_info_t)
 WRITE_CLASS_ENCODER_FEATURES(FSMapUser)

diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc
index 43fe380c7895bd7fc11baabd4a5ae0cb6f22c225..caa1bfc45310284520b22428180ed2824d801d54 100644 (file)
--- a/src/mds/InoTable.cc
+++ b/src/mds/InoTable.cc
@@ -185,7 +185,7 @@ void InoTable::dump(Formatter *f) const
 }
 
 
-void InoTable::generate_test_instances(list<InoTable*>& ls)
+void InoTable::generate_test_instances(std::list<InoTable*>& ls)
 {
   ls.push_back(new InoTable());
 }

diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h
index 0e26e1e9872ef828923247be2b46340095f3417b..f16531c53aef0e87a0e66acec589b2b920c5a448 100644 (file)
--- a/src/mds/InoTable.h
+++ b/src/mds/InoTable.h
@@ -69,7 +69,7 @@ class InoTable : public MDSTable {
     decode_state(bl);
   }
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<InoTable*>& ls);
+  static void generate_test_instances(std::list<InoTable*>& ls);
 
   void skip_inos(inodeno_t i);
 

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 4b213cf704381617056ab837793bc614ae57a786..dc31cb44125ef62d4f0eb46b8d41550fd4690510 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -112,7 +112,7 @@ void MDSMap::mds_info_t::print_summary(ostream &out) const
   }
 }
 
-void MDSMap::mds_info_t::generate_test_instances(list<mds_info_t*>& ls)
+void MDSMap::mds_info_t::generate_test_instances(std::list<mds_info_t*>& ls)
 {
   mds_info_t *sample = new mds_info_t();
   ls.push_back(sample);
@@ -187,7 +187,7 @@ void MDSMap::dump(Formatter *f) const
   f->dump_int("standby_count_wanted", std::max(0, standby_count_wanted));
 }
 
-void MDSMap::generate_test_instances(list<MDSMap*>& ls)
+void MDSMap::generate_test_instances(std::list<MDSMap*>& ls)
 {
   MDSMap *m = new MDSMap();
   m->max_mds = 1;

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 5ba266a4294f6d3d68847b221b73e9242f0d9c19..0a9e50ab0e1599291ac87fcbd45220f962f3b52e 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -143,7 +143,7 @@ public:
     // The long form name for use in cluster log messages`
     std::string human_name() const;
 
-    static void generate_test_instances(list<mds_info_t*>& ls);
+    static void generate_test_instances(std::list<mds_info_t*>& ls);
   private:
     void encode_versioned(bufferlist& bl, uint64_t features) const;
     void encode_unversioned(bufferlist& bl) const;
@@ -668,7 +668,7 @@ public:
   void print_summary(Formatter *f, ostream *out) const;
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<MDSMap*>& ls);
+  static void generate_test_instances(std::list<MDSMap*>& ls);
 
   static bool state_transition_valid(DaemonState prev, DaemonState next);
 };

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index b3a73e8797a274a3361ec6138cd79539995b2e17..144b2607484c4eb5b690c8674b94edd82d207b67 100644 (file)
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -586,7 +586,7 @@ void SessionMapStore::dump(Formatter *f) const
   f->close_section(); // Sessions
 }
 
-void SessionMapStore::generate_test_instances(list<SessionMapStore*>& ls)
+void SessionMapStore::generate_test_instances(std::list<SessionMapStore*>& ls)
 {
   // pretty boring for now
   ls.push_back(new SessionMapStore());

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index d9b2104d27df6a177ff955b9f9286dffd14ba46d..84c21ceb587f6c2574381c1bf8964169257edb26 100644 (file)
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -518,7 +518,7 @@ public:
     return s;
   }
 
-  static void generate_test_instances(list<SessionMapStore*>& ls);
+  static void generate_test_instances(std::list<SessionMapStore*>& ls);
 
   void reset_state()
   {

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index d9690d400fce32c0b5e4b9b99afa165ae630f003..fc1c59b15312fd022e7dc3e178ebf2d8a3139506 100644 (file)
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -419,7 +419,7 @@ void SnapServer::dump(Formatter *f) const
   f->close_section();
 }
 
-void SnapServer::generate_test_instances(list<SnapServer*>& ls)
+void SnapServer::generate_test_instances(std::list<SnapServer*>& ls)
 {
   list<SnapInfo*> snapinfo_instances;
   SnapInfo::generate_test_instances(snapinfo_instances);

diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h
index 50925e9553ed7bc565a4f59453b7303eacf9caee..0fee9db9a103959ddcc596cfeaea737d42e4138d 100644 (file)
--- a/src/mds/SnapServer.h
+++ b/src/mds/SnapServer.h
@@ -138,7 +138,7 @@ public:
   }
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<SnapServer*>& ls);
+  static void generate_test_instances(std::list<SnapServer*>& ls);
 
   bool force_update(snapid_t last, snapid_t v2_since,
                    map<snapid_t, SnapInfo>& _snaps);

diff --git a/src/mds/events/ECommitted.h b/src/mds/events/ECommitted.h
index 0459f9d0fae5c81e56b285ee7d2f5ba6943a437f..41b1208133f4f2c394ad6d90a0294aa1adf94554 100644 (file)
--- a/src/mds/events/ECommitted.h
+++ b/src/mds/events/ECommitted.h
@@ -33,7 +33,7 @@ public:
   void encode(bufferlist &bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ECommitted*>& ls);
+  static void generate_test_instances(std::list<ECommitted*>& ls);
 
   void update_segment() override {}
   void replay(MDSRank *mds) override;

diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h
index 94e39a84816399962ff69f344acf9c9e9bafb4dd..589062db2a159df35e9fe233769a59ea6312c3ad 100644 (file)
--- a/src/mds/events/EExport.h
+++ b/src/mds/events/EExport.h
@@ -49,7 +49,7 @@ public:
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EExport*>& ls);
+  static void generate_test_instances(std::list<EExport*>& ls);
   void replay(MDSRank *mds) override;
 
 };

diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h
index 90d9238b030f6f7ca8571907f6fdd33b285da68c..9e86f1915980a68281f2102357f8e3d606429b2d 100644 (file)
--- a/src/mds/events/EFragment.h
+++ b/src/mds/events/EFragment.h
@@ -73,7 +73,7 @@ public:
   void encode(bufferlist &bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EFragment*>& ls);
+  static void generate_test_instances(std::list<EFragment*>& ls);
   void replay(MDSRank *mds) override;
 };
 WRITE_CLASS_ENCODER_FEATURES(EFragment)

diff --git a/src/mds/events/EImportFinish.h b/src/mds/events/EImportFinish.h
index 699c0527c5b5329295a971498363c66f526df228..24bb1cd13533fb7e7c03e0703f5221919b8745d4 100644 (file)
--- a/src/mds/events/EImportFinish.h
+++ b/src/mds/events/EImportFinish.h
@@ -43,7 +43,7 @@ class EImportFinish : public LogEvent {
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EImportFinish*>& ls);
+  static void generate_test_instances(std::list<EImportFinish*>& ls);
   
   void replay(MDSRank *mds) override;
 

diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h
index 276469e84cc1d1884c1559caa599cc1a52c75c00..d4673a84accc73971ba8a50927bda70e8985529e 100644 (file)
--- a/src/mds/events/EImportStart.h
+++ b/src/mds/events/EImportStart.h
@@ -50,7 +50,7 @@ public:
   void encode(bufferlist &bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EImportStart*>& ls);
+  static void generate_test_instances(std::list<EImportStart*>& ls);
   
   void update_segment() override;
   void replay(MDSRank *mds) override;

diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index 199e5fa865c155543a8731f01c988e36d024ae5c..e0e2add26406327a2d6a71e84d5686eaa92594de 100644 (file)
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -104,7 +104,7 @@ public:
     void encode(bufferlist& bl, uint64_t features) const;
     void decode(bufferlist::const_iterator &bl);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<EMetaBlob::fullbit*>& ls);
+    static void generate_test_instances(std::list<EMetaBlob::fullbit*>& ls);
 
     void update_inode(MDSRank *mds, CInode *in);
     bool is_dirty() const { return (state & STATE_DIRTY); }
@@ -158,7 +158,7 @@ public:
          << " dirty=" << dirty << std::endl;
     }
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<remotebit*>& ls);
+    static void generate_test_instances(std::list<remotebit*>& ls);
   };
   WRITE_CLASS_ENCODER(remotebit)
 
@@ -179,7 +179,7 @@ public:
     void encode(bufferlist& bl) const;
     void decode(bufferlist::const_iterator &bl);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<nullbit*>& ls);
+    static void generate_test_instances(std::list<nullbit*>& ls);
     void print(ostream& out) const {
       out << " nullbit dn " << dn << " [" << dnfirst << "," << dnlast << "] dnv " << dnv
          << " dirty=" << dirty << std::endl;
@@ -296,7 +296,7 @@ public:
     void encode(bufferlist& bl, uint64_t features) const;
     void decode(bufferlist::const_iterator &bl);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<dirlump*>& ls);
+    static void generate_test_instances(std::list<dirlump*>& ls);
   };
   WRITE_CLASS_ENCODER_FEATURES(dirlump)
 
@@ -341,7 +341,7 @@ private:
   entity_name_t get_client_name() const {return client_name;}
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<EMetaBlob*>& ls);
+  static void generate_test_instances(std::list<EMetaBlob*>& ls);
   // soft stateadd
   uint64_t last_subtree_map;
   uint64_t event_seq;

diff --git a/src/mds/events/EOpen.h b/src/mds/events/EOpen.h
index 192745d9bf0c7ef145f2e224bb3f30f1a775e013..06bfd3e882ea457bb2c9b503e52101f2c8e618e9 100644 (file)
--- a/src/mds/events/EOpen.h
+++ b/src/mds/events/EOpen.h
@@ -51,7 +51,7 @@ public:
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EOpen*>& ls);
+  static void generate_test_instances(std::list<EOpen*>& ls);
 
   void update_segment() override;
   void replay(MDSRank *mds) override;

diff --git a/src/mds/events/EResetJournal.h b/src/mds/events/EResetJournal.h
index 3004978a22bffbedcd6cd57a4468a2fc03a8017b..302227fc6439154b6d8112ca4563afb2ffe052f2 100644 (file)
--- a/src/mds/events/EResetJournal.h
+++ b/src/mds/events/EResetJournal.h
@@ -27,7 +27,7 @@ class EResetJournal : public LogEvent {
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EResetJournal*>& ls);
+  static void generate_test_instances(std::list<EResetJournal*>& ls);
   void print(ostream& out) const override {
     out << "EResetJournal";
   }

diff --git a/src/mds/events/ESession.h b/src/mds/events/ESession.h
index 0b65765e1479eadc36a802e85bfc9de35e0c3c6f..bddb04705c322ec2d9a61629436b27911733e8f7 100644 (file)
--- a/src/mds/events/ESession.h
+++ b/src/mds/events/ESession.h
@@ -47,7 +47,7 @@ class ESession : public LogEvent {
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ESession*>& ls);
+  static void generate_test_instances(std::list<ESession*>& ls);
 
   void print(ostream& out) const override {
     if (open)

diff --git a/src/mds/events/ESessions.h b/src/mds/events/ESessions.h
index aa0eeff8158b0a2783b5085983014e228f5f5079..fad70212084ea04f6cf9dc42d33aac09d01d5111 100644 (file)
--- a/src/mds/events/ESessions.h
+++ b/src/mds/events/ESessions.h
@@ -47,7 +47,7 @@ public:
     else decode_new(bl);
   }
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ESessions*>& ls);
+  static void generate_test_instances(std::list<ESessions*>& ls);
 
   void print(ostream& out) const override {
     out << "ESessions " << client_map.size() << " opens cmapv " << cmapv;

diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h
index 23ca430bc1cb15710bb2f78005555a2e89323ac4..674166fbdfe89c2f757f63cfa9dc46ac70cece70 100644 (file)
--- a/src/mds/events/ESlaveUpdate.h
+++ b/src/mds/events/ESlaveUpdate.h
@@ -39,7 +39,7 @@ struct link_rollback {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<link_rollback*>& ls);
+  static void generate_test_instances(std::list<link_rollback*>& ls);
 };
 WRITE_CLASS_ENCODER(link_rollback)
 
@@ -60,7 +60,7 @@ struct rmdir_rollback {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<rmdir_rollback*>& ls);
+  static void generate_test_instances(std::list<rmdir_rollback*>& ls);
 };
 WRITE_CLASS_ENCODER(rmdir_rollback)
 
@@ -79,7 +79,7 @@ struct rename_rollback {
     void encode(bufferlist& bl) const;
     void decode(bufferlist::const_iterator& bl);
     void dump(Formatter *f) const;
-    static void generate_test_instances(list<drec*>& ls);
+    static void generate_test_instances(std::list<drec*>& ls);
   };
   WRITE_CLASS_MEMBER_ENCODER(drec)
 
@@ -93,7 +93,7 @@ struct rename_rollback {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<rename_rollback*>& ls);
+  static void generate_test_instances(std::list<rename_rollback*>& ls);
 };
 WRITE_CLASS_ENCODER(rename_rollback::drec)
 WRITE_CLASS_ENCODER(rename_rollback)
@@ -148,7 +148,7 @@ public:
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ESlaveUpdate*>& ls);
+  static void generate_test_instances(std::list<ESlaveUpdate*>& ls);
 
   void replay(MDSRank *mds) override;
 };

diff --git a/src/mds/events/ESubtreeMap.h b/src/mds/events/ESubtreeMap.h
index 08d4a58117689b9071e68db0102d89b8ed7cca23..3dc824087f523b6d36fe6a04e46383dc1427240f 100644 (file)
--- a/src/mds/events/ESubtreeMap.h
+++ b/src/mds/events/ESubtreeMap.h
@@ -39,7 +39,7 @@ public:
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ESubtreeMap*>& ls);
+  static void generate_test_instances(std::list<ESubtreeMap*>& ls);
 
   void replay(MDSRank *mds) override;
 };

diff --git a/src/mds/events/ETableClient.h b/src/mds/events/ETableClient.h
index bf3e752d5d44629d9923eba0f0e4fddd4b697dcf..3f6e454e646d71be3ae7bc7d0ff711f1bb16e2aa 100644 (file)
--- a/src/mds/events/ETableClient.h
+++ b/src/mds/events/ETableClient.h
@@ -34,7 +34,7 @@ struct ETableClient : public LogEvent {
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ETableClient*>& ls);
+  static void generate_test_instances(std::list<ETableClient*>& ls);
 
   void print(ostream& out) const override {
     out << "ETableClient " << get_mdstable_name(table) << " " << get_mdstableserver_opname(op);

diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h
index 0005b132466be48153eebd14624b487ea4d7e4f7..59fe8ff1cbdab90b109bb23a794e130160ec3c74 100644 (file)
--- a/src/mds/events/ETableServer.h
+++ b/src/mds/events/ETableServer.h
@@ -39,7 +39,7 @@ struct ETableServer : public LogEvent {
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ETableServer*>& ls);
+  static void generate_test_instances(std::list<ETableServer*>& ls);
 
   void print(ostream& out) const override {
     out << "ETableServer " << get_mdstable_name(table) 

diff --git a/src/mds/events/EUpdate.h b/src/mds/events/EUpdate.h
index dc710d5210f8af53801967071d3eb8c1226de973..b9f173f82836ec32b65f816d1ff657879bd146b1 100644 (file)
--- a/src/mds/events/EUpdate.h
+++ b/src/mds/events/EUpdate.h
@@ -45,7 +45,7 @@ public:
   void encode(bufferlist& bl, uint64_t features) const override;
   void decode(bufferlist::const_iterator& bl) override;
   void dump(Formatter *f) const override;
-  static void generate_test_instances(list<EUpdate*>& ls);
+  static void generate_test_instances(std::list<EUpdate*>& ls);
 
   void update_segment() override;
   void replay(MDSRank *mds) override;

diff --git a/src/mds/inode_backtrace.cc b/src/mds/inode_backtrace.cc
index 50e986a10d91871434584bd18c2ab63cb417a729..8932f62a72be94102e7b057a206160c9af4c43d1 100644 (file)
--- a/src/mds/inode_backtrace.cc
+++ b/src/mds/inode_backtrace.cc
@@ -40,7 +40,7 @@ void inode_backpointer_t::dump(Formatter *f) const
   f->dump_unsigned("version", version);
 }
 
-void inode_backpointer_t::generate_test_instances(list<inode_backpointer_t*>& ls)
+void inode_backpointer_t::generate_test_instances(std::list<inode_backpointer_t*>& ls)
 {
   ls.push_back(new inode_backpointer_t);
   ls.push_back(new inode_backpointer_t);
@@ -105,7 +105,7 @@ void inode_backtrace_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void inode_backtrace_t::generate_test_instances(list<inode_backtrace_t*>& ls)
+void inode_backtrace_t::generate_test_instances(std::list<inode_backtrace_t*>& ls)
 {
   ls.push_back(new inode_backtrace_t);
   ls.push_back(new inode_backtrace_t);

diff --git a/src/mds/inode_backtrace.h b/src/mds/inode_backtrace.h
index 7c60865c22d55f47857ab04de42237ded1f38df7..7ca046d39688a0aa68a9b68534dc8e40455bbc56 100644 (file)
--- a/src/mds/inode_backtrace.h
+++ b/src/mds/inode_backtrace.h
@@ -33,7 +33,7 @@ struct inode_backpointer_t {
   void decode(bufferlist::const_iterator &bl);
   void decode_old(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<inode_backpointer_t*>& ls);
+  static void generate_test_instances(std::list<inode_backpointer_t*>& ls);
 };
 WRITE_CLASS_ENCODER(inode_backpointer_t)
 
@@ -62,7 +62,7 @@ struct inode_backtrace_t {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<inode_backtrace_t*>& ls);
+  static void generate_test_instances(std::list<inode_backtrace_t*>& ls);
 
   /**
    * Compare two backtraces *for the same inode*.

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 4eec4ada2b1f6dda0e98a98db2407bc67576f56f..c428781dd1918ef30747064b9d5204e74eb3efc6 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -508,7 +508,7 @@ void EMetaBlob::fullbit::dump(Formatter *f) const
   }
 }
 
-void EMetaBlob::fullbit::generate_test_instances(list<EMetaBlob::fullbit*>& ls)
+void EMetaBlob::fullbit::generate_test_instances(std::list<EMetaBlob::fullbit*>& ls)
 {
   CInode::mempool_inode inode;
   fragtree_t fragtree;
@@ -641,7 +641,7 @@ void EMetaBlob::remotebit::dump(Formatter *f) const
 }
 
 void EMetaBlob::remotebit::
-generate_test_instances(list<EMetaBlob::remotebit*>& ls)
+generate_test_instances(std::list<EMetaBlob::remotebit*>& ls)
 {
   remotebit *remote = new remotebit("/test/dn", 0, 10, 15, 1, IFTODT(S_IFREG), false);
   ls.push_back(remote);
@@ -680,7 +680,7 @@ void EMetaBlob::nullbit::dump(Formatter *f) const
   f->dump_string("dirty", dirty ? "true" : "false");
 }
 
-void EMetaBlob::nullbit::generate_test_instances(list<nullbit*>& ls)
+void EMetaBlob::nullbit::generate_test_instances(std::list<nullbit*>& ls)
 {
   nullbit *sample = new nullbit("/test/dentry", 0, 10, 15, false);
   nullbit *sample2 = new nullbit("/test/dirty", 10, 20, 25, true);
@@ -753,7 +753,7 @@ void EMetaBlob::dirlump::dump(Formatter *f) const
   f->close_section(); // null bits
 }
 
-void EMetaBlob::dirlump::generate_test_instances(list<dirlump*>& ls)
+void EMetaBlob::dirlump::generate_test_instances(std::list<dirlump*>& ls)
 {
   ls.push_back(new dirlump());
 }
@@ -1084,7 +1084,7 @@ void EMetaBlob::dump(Formatter *f) const
   f->close_section(); // client requests
 }
 
-void EMetaBlob::generate_test_instances(list<EMetaBlob*>& ls)
+void EMetaBlob::generate_test_instances(std::list<EMetaBlob*>& ls)
 {
   ls.push_back(new EMetaBlob());
 }
@@ -1709,7 +1709,7 @@ void ESession::dump(Formatter *f) const
   f->close_section();  // client_metadata
 }
 
-void ESession::generate_test_instances(list<ESession*>& ls)
+void ESession::generate_test_instances(std::list<ESession*>& ls)
 {
   ls.push_back(new ESession);
 }
@@ -1762,7 +1762,7 @@ void ESessions::dump(Formatter *f) const
   f->close_section(); // client map
 }
 
-void ESessions::generate_test_instances(list<ESessions*>& ls)
+void ESessions::generate_test_instances(std::list<ESessions*>& ls)
 {
   ls.push_back(new ESessions());
 }
@@ -1829,7 +1829,7 @@ void ETableServer::dump(Formatter *f) const
   f->dump_int("version", version);
 }
 
-void ETableServer::generate_test_instances(list<ETableServer*>& ls)
+void ETableServer::generate_test_instances(std::list<ETableServer*>& ls)
 {
   ls.push_back(new ETableServer());
 }
@@ -1921,7 +1921,7 @@ void ETableClient::dump(Formatter *f) const
   f->dump_int("tid", tid);
 }
 
-void ETableClient::generate_test_instances(list<ETableClient*>& ls)
+void ETableClient::generate_test_instances(std::list<ETableClient*>& ls)
 {
   ls.push_back(new ETableClient());
 }
@@ -2019,7 +2019,7 @@ void EUpdate::dump(Formatter *f) const
   f->dump_string("had slaves", had_slaves ? "true" : "false");
 }
 
-void EUpdate::generate_test_instances(list<EUpdate*>& ls)
+void EUpdate::generate_test_instances(std::list<EUpdate*>& ls)
 {
   ls.push_back(new EUpdate());
 }
@@ -2109,7 +2109,7 @@ void EOpen::dump(Formatter *f) const
   f->close_section(); // inos
 }
 
-void EOpen::generate_test_instances(list<EOpen*>& ls)
+void EOpen::generate_test_instances(std::list<EOpen*>& ls)
 {
   ls.push_back(new EOpen());
   ls.push_back(new EOpen());
@@ -2183,7 +2183,7 @@ void ECommitted::dump(Formatter *f) const {
   f->dump_stream("reqid") << reqid;
 }
 
-void ECommitted::generate_test_instances(list<ECommitted*>& ls)
+void ECommitted::generate_test_instances(std::list<ECommitted*>& ls)
 {
   ls.push_back(new ECommitted);
   ls.push_back(new ECommitted);
@@ -2231,7 +2231,7 @@ void link_rollback::dump(Formatter *f) const
   f->dump_stream("old_dir_rctime") << old_dir_rctime;
 }
 
-void link_rollback::generate_test_instances(list<link_rollback*>& ls)
+void link_rollback::generate_test_instances(std::list<link_rollback*>& ls)
 {
   ls.push_back(new link_rollback());
 }
@@ -2270,7 +2270,7 @@ void rmdir_rollback::dump(Formatter *f) const
   f->dump_string("destination dname", dest_dname);
 }
 
-void rmdir_rollback::generate_test_instances(list<rmdir_rollback*>& ls)
+void rmdir_rollback::generate_test_instances(std::list<rmdir_rollback*>& ls)
 {
   ls.push_back(new rmdir_rollback());
 }
@@ -2327,7 +2327,7 @@ void rename_rollback::drec::dump(Formatter *f) const
   f->dump_stream("old ctime") << old_ctime;
 }
 
-void rename_rollback::drec::generate_test_instances(list<drec*>& ls)
+void rename_rollback::drec::generate_test_instances(std::list<drec*>& ls)
 {
   ls.push_back(new drec());
   ls.back()->remote_d_type = IFTODT(S_IFREG);
@@ -2376,7 +2376,7 @@ void rename_rollback::dump(Formatter *f) const
   f->dump_stream("ctime") << ctime;
 }
 
-void rename_rollback::generate_test_instances(list<rename_rollback*>& ls)
+void rename_rollback::generate_test_instances(std::list<rename_rollback*>& ls)
 {
   ls.push_back(new rename_rollback());
   ls.back()->orig_src.remote_d_type = IFTODT(S_IFREG);
@@ -2427,7 +2427,7 @@ void ESlaveUpdate::dump(Formatter *f) const
   f->dump_int("original op", origop);
 }
 
-void ESlaveUpdate::generate_test_instances(list<ESlaveUpdate*>& ls)
+void ESlaveUpdate::generate_test_instances(std::list<ESlaveUpdate*>& ls)
 {
   ls.push_back(new ESlaveUpdate());
 }
@@ -2534,7 +2534,7 @@ void ESubtreeMap::dump(Formatter *f) const
   f->dump_int("expire position", expire_pos);
 }
 
-void ESubtreeMap::generate_test_instances(list<ESubtreeMap*>& ls)
+void ESubtreeMap::generate_test_instances(std::list<ESubtreeMap*>& ls)
 {
   ls.push_back(new ESubtreeMap());
 }
@@ -2762,7 +2762,7 @@ void EFragment::dump(Formatter *f) const
   f->dump_int("bits", bits);
 }
 
-void EFragment::generate_test_instances(list<EFragment*>& ls)
+void EFragment::generate_test_instances(std::list<EFragment*>& ls)
 {
   ls.push_back(new EFragment);
   ls.push_back(new EFragment);
@@ -2855,7 +2855,7 @@ void EExport::dump(Formatter *f) const
   f->close_section(); // bounds dirfrags
 }
 
-void EExport::generate_test_instances(list<EExport*>& ls)
+void EExport::generate_test_instances(std::list<EExport*>& ls)
 {
   EExport *sample = new EExport();
   ls.push_back(sample);
@@ -2962,7 +2962,7 @@ void EImportStart::dump(Formatter *f) const
   f->close_section();
 }
 
-void EImportStart::generate_test_instances(list<EImportStart*>& ls)
+void EImportStart::generate_test_instances(std::list<EImportStart*>& ls)
 {
   ls.push_back(new EImportStart);
 }
@@ -3020,7 +3020,7 @@ void EImportFinish::dump(Formatter *f) const
   f->dump_stream("base dirfrag") << base;
   f->dump_string("success", success ? "true" : "false");
 }
-void EImportFinish::generate_test_instances(list<EImportFinish*>& ls)
+void EImportFinish::generate_test_instances(std::list<EImportFinish*>& ls)
 {
   ls.push_back(new EImportFinish);
   ls.push_back(new EImportFinish);
@@ -3050,7 +3050,7 @@ void EResetJournal::dump(Formatter *f) const
   f->dump_stream("timestamp") << stamp;
 }
 
-void EResetJournal::generate_test_instances(list<EResetJournal*>& ls)
+void EResetJournal::generate_test_instances(std::list<EResetJournal*>& ls)
 {
   ls.push_back(new EResetJournal());
 }

diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index 20a2d2d5788017b1db50a5108268912247962443..238a3fc4fe1798eff20708fcae82a18207b8057f 100644 (file)
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -45,7 +45,7 @@ void frag_info_t::dump(Formatter *f) const
   f->dump_unsigned("num_subdirs", nsubdirs);
 }
 
-void frag_info_t::generate_test_instances(list<frag_info_t*>& ls)
+void frag_info_t::generate_test_instances(std::list<frag_info_t*>& ls)
 {
   ls.push_back(new frag_info_t);
   ls.push_back(new frag_info_t);
@@ -116,7 +116,7 @@ void nest_info_t::dump(Formatter *f) const
   f->dump_stream("rctime") << rctime;
 }
 
-void nest_info_t::generate_test_instances(list<nest_info_t*>& ls)
+void nest_info_t::generate_test_instances(std::list<nest_info_t*>& ls)
 {
   ls.push_back(new nest_info_t);
   ls.push_back(new nest_info_t);
@@ -154,7 +154,7 @@ void quota_info_t::dump(Formatter *f) const
   f->dump_int("max_files", max_files);
 }
 
-void quota_info_t::generate_test_instances(list<quota_info_t *>& ls)
+void quota_info_t::generate_test_instances(std::list<quota_info_t *>& ls)
 {
   ls.push_back(new quota_info_t);
   ls.push_back(new quota_info_t);
@@ -202,7 +202,7 @@ void client_writeable_range_t::dump(Formatter *f) const
   f->dump_unsigned("follows", follows);
 }
 
-void client_writeable_range_t::generate_test_instances(list<client_writeable_range_t*>& ls)
+void client_writeable_range_t::generate_test_instances(std::list<client_writeable_range_t*>& ls)
 {
   ls.push_back(new client_writeable_range_t);
   ls.push_back(new client_writeable_range_t);
@@ -304,7 +304,7 @@ void fnode_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void fnode_t::generate_test_instances(list<fnode_t*>& ls)
+void fnode_t::generate_test_instances(std::list<fnode_t*>& ls)
 {
   ls.push_back(new fnode_t);
   ls.push_back(new fnode_t);
@@ -353,7 +353,7 @@ void old_rstat_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void old_rstat_t::generate_test_instances(list<old_rstat_t*>& ls)
+void old_rstat_t::generate_test_instances(std::list<old_rstat_t*>& ls)
 {
   ls.push_back(new old_rstat_t());
   ls.push_back(new old_rstat_t());
@@ -557,7 +557,7 @@ void session_info_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void session_info_t::generate_test_instances(list<session_info_t*>& ls)
+void session_info_t::generate_test_instances(std::list<session_info_t*>& ls)
 {
   ls.push_back(new session_info_t);
   ls.push_back(new session_info_t);
@@ -595,7 +595,7 @@ void string_snap_t::dump(Formatter *f) const
   f->dump_unsigned("snapid", snapid);
 }
 
-void string_snap_t::generate_test_instances(list<string_snap_t*>& ls)
+void string_snap_t::generate_test_instances(std::list<string_snap_t*>& ls)
 {
   ls.push_back(new string_snap_t);
   ls.push_back(new string_snap_t);
@@ -638,7 +638,7 @@ void MDSCacheObjectInfo::dump(Formatter *f) const
   f->dump_unsigned("snapid", snapid);
 }
 
-void MDSCacheObjectInfo::generate_test_instances(list<MDSCacheObjectInfo*>& ls)
+void MDSCacheObjectInfo::generate_test_instances(std::list<MDSCacheObjectInfo*>& ls)
 {
   ls.push_back(new MDSCacheObjectInfo);
   ls.push_back(new MDSCacheObjectInfo);
@@ -681,7 +681,7 @@ void mds_table_pending_t::dump(Formatter *f) const
   f->dump_unsigned("tid", tid);
 }
 
-void mds_table_pending_t::generate_test_instances(list<mds_table_pending_t*>& ls)
+void mds_table_pending_t::generate_test_instances(std::list<mds_table_pending_t*>& ls)
 {
   ls.push_back(new mds_table_pending_t);
   ls.push_back(new mds_table_pending_t);
@@ -723,7 +723,7 @@ void inode_load_vec_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void inode_load_vec_t::generate_test_instances(list<inode_load_vec_t*>& ls)
+void inode_load_vec_t::generate_test_instances(std::list<inode_load_vec_t*>& ls)
 {
   ls.push_back(new inode_load_vec_t(DecayRate()));
 }
@@ -846,7 +846,7 @@ void cap_reconnect_t::dump(Formatter *f) const
   f->dump_string("has file locks", capinfo.flock_len ? "true" : "false");
 }
 
-void cap_reconnect_t::generate_test_instances(list<cap_reconnect_t*>& ls)
+void cap_reconnect_t::generate_test_instances(std::list<cap_reconnect_t*>& ls)
 {
   ls.push_back(new cap_reconnect_t);
   ls.back()->path = "/test/path";
@@ -885,7 +885,7 @@ void snaprealm_reconnect_t::dump(Formatter *f) const
   f->dump_int("parent", realm.parent);
 }
 
-void snaprealm_reconnect_t::generate_test_instances(list<snaprealm_reconnect_t*>& ls)
+void snaprealm_reconnect_t::generate_test_instances(std::list<snaprealm_reconnect_t*>& ls)
 {
   ls.push_back(new snaprealm_reconnect_t);
   ls.back()->realm.ino = 0x10000000001ULL;

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 49f6944e4bf6b695cdb54a407b525695b7d3c974..9f701549693588741b4cb3e97976e29cc92cc0ef 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -209,7 +209,7 @@ struct frag_info_t : public scatter_info_t {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<frag_info_t*>& ls);
+  static void generate_test_instances(std::list<frag_info_t*>& ls);
 };
 WRITE_CLASS_ENCODER(frag_info_t)
 
@@ -272,7 +272,7 @@ struct nest_info_t : public scatter_info_t {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<nest_info_t*>& ls);
+  static void generate_test_instances(std::list<nest_info_t*>& ls);
 };
 WRITE_CLASS_ENCODER(nest_info_t)
 
@@ -338,7 +338,7 @@ struct quota_info_t
   }
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<quota_info_t *>& ls);
+  static void generate_test_instances(std::list<quota_info_t *>& ls);
 
   bool is_valid() const {
     return max_bytes >=0 && max_files >=0;
@@ -851,7 +851,7 @@ void inode_t<Allocator>::dump(Formatter *f) const
 }
 
 template<template<typename> class Allocator>
-void inode_t<Allocator>::generate_test_instances(list<inode_t*>& ls)
+void inode_t<Allocator>::generate_test_instances(std::list<inode_t*>& ls)
 {
   ls.push_back(new inode_t<Allocator>);
   ls.push_back(new inode_t<Allocator>);
@@ -1039,7 +1039,7 @@ struct fnode_t {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<fnode_t*>& ls);
+  static void generate_test_instances(std::list<fnode_t*>& ls);
   fnode_t() {}
 };
 WRITE_CLASS_ENCODER(fnode_t)
@@ -1052,7 +1052,7 @@ struct old_rstat_t {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& p);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<old_rstat_t*>& ls);
+  static void generate_test_instances(std::list<old_rstat_t*>& ls);
 };
 WRITE_CLASS_ENCODER(old_rstat_t)
 
@@ -1181,7 +1181,7 @@ struct session_info_t {
   void encode(bufferlist& bl, uint64_t features) const;
   void decode(bufferlist::const_iterator& p);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<session_info_t*>& ls);
+  static void generate_test_instances(std::list<session_info_t*>& ls);
 };
 WRITE_CLASS_ENCODER_FEATURES(session_info_t)
 
@@ -1273,7 +1273,7 @@ struct string_snap_t {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& p);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<string_snap_t*>& ls);
+  static void generate_test_instances(std::list<string_snap_t*>& ls);
 };
 WRITE_CLASS_ENCODER(string_snap_t)
 
@@ -1301,7 +1301,7 @@ struct mds_table_pending_t {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<mds_table_pending_t*>& ls);
+  static void generate_test_instances(std::list<mds_table_pending_t*>& ls);
 };
 WRITE_CLASS_ENCODER(mds_table_pending_t)
 
@@ -1387,7 +1387,7 @@ struct cap_reconnect_t {
   void decode_old(bufferlist::const_iterator& bl);
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<cap_reconnect_t*>& ls);
+  static void generate_test_instances(std::list<cap_reconnect_t*>& ls);
 };
 WRITE_CLASS_ENCODER(cap_reconnect_t)
 
@@ -1408,7 +1408,7 @@ struct snaprealm_reconnect_t {
   void decode_old(bufferlist::const_iterator& bl);
 
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<snaprealm_reconnect_t*>& ls);
+  static void generate_test_instances(std::list<snaprealm_reconnect_t*>& ls);
 };
 WRITE_CLASS_ENCODER(snaprealm_reconnect_t)
 
@@ -1541,7 +1541,7 @@ public:
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator& p);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<inode_load_vec_t*>& ls);
+  static void generate_test_instances(std::list<inode_load_vec_t*>& ls);
 
 private:
   std::array<DecayCounter, NUM> vec;
@@ -1759,7 +1759,7 @@ public:
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<MDSCacheObjectInfo*>& ls);
+  static void generate_test_instances(std::list<MDSCacheObjectInfo*>& ls);
 };
 
 inline std::ostream& operator<<(std::ostream& out, const MDSCacheObjectInfo &info) {

diff --git a/src/mds/snap.cc b/src/mds/snap.cc
index e53daef2c508bfbb15c91c76dde2488cc0371922..3da4cda2b4b67c149f9fdbeacf8c302f874d885e 100644 (file)
--- a/src/mds/snap.cc
+++ b/src/mds/snap.cc
@@ -50,7 +50,7 @@ void SnapInfo::dump(Formatter *f) const
   f->dump_string("name", name);
 }
 
-void SnapInfo::generate_test_instances(list<SnapInfo*>& ls)
+void SnapInfo::generate_test_instances(std::list<SnapInfo*>& ls)
 {
   ls.push_back(new SnapInfo);
   ls.push_back(new SnapInfo);
@@ -106,7 +106,7 @@ void snaplink_t::dump(Formatter *f) const
   f->dump_unsigned("first", first);
 }
 
-void snaplink_t::generate_test_instances(list<snaplink_t*>& ls)
+void snaplink_t::generate_test_instances(std::list<snaplink_t*>& ls)
 {
   ls.push_back(new snaplink_t);
   ls.push_back(new snaplink_t);
@@ -196,7 +196,7 @@ void sr_t::dump(Formatter *f) const
   f->close_section();
 }
 
-void sr_t::generate_test_instances(list<sr_t*>& ls)
+void sr_t::generate_test_instances(std::list<sr_t*>& ls)
 {
   ls.push_back(new sr_t);
   ls.push_back(new sr_t);

diff --git a/src/mds/snap.h b/src/mds/snap.h
index b3c00ddf78ad232e0139c88f27f3eeb0e26b7c87..9ccdf71fe24376cb8f80155a8ec872d152064ee1 100644 (file)
--- a/src/mds/snap.h
+++ b/src/mds/snap.h
@@ -34,7 +34,7 @@ struct SnapInfo {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<SnapInfo*>& ls);
+  static void generate_test_instances(std::list<SnapInfo*>& ls);
 
   std::string_view get_long_name() const;
 };
@@ -67,7 +67,7 @@ struct snaplink_t {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<snaplink_t*>& ls);
+  static void generate_test_instances(std::list<snaplink_t*>& ls);
 };
 WRITE_CLASS_ENCODER(snaplink_t)
 
@@ -103,7 +103,7 @@ struct sr_t {
   void encode(bufferlist &bl) const;
   void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<sr_t*>& ls);
+  static void generate_test_instances(std::list<sr_t*>& ls);
 };
 WRITE_CLASS_ENCODER(sr_t)