atleast libapt should announce to itself that it is clean…

(and be it if it tries to announce that…)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 2635d52c8d215874c2b77e3973fc495bb39e7ebf..84791a70aa7fdcd9094fbd0bdbc2cbaf68726074 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -26,6 +26,8 @@
 #include <sys/stat.h>
                                                                        /*}}}*/
 
 #include <sys/stat.h>
                                                                        /*}}}*/
 

+using std::string;
+

 // SourcesIndex::debSourcesIndex - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // SourcesIndex::debSourcesIndex - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 5d824f9cb8156cad3c30a767e2174e4a2ff4d173..482581979f4cc9c87f448287bef538d30fecc577 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -24,7 +24,7 @@
 // edspIndex::edspIndex - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // edspIndex::edspIndex - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-edspIndex::edspIndex(string File) : debStatusIndex(File)
+edspIndex::edspIndex(std::string File) : debStatusIndex(File)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -44,7 +44,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);

-   if (Gen.SelectFile(File,string(),*this) == false)
+   if (Gen.SelectFile(File,std::string(),*this) == false)

       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 9f999c41b43b05ac8b95e93d4417a45ae17fa4ba..ec072fddd76ac5bd9757673c4c76c0ce36e8c20d 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -35,12 +35,14 @@
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/

-typedef vector<pkgIndexFile *>::iterator FileIterator;
+typedef std::vector<pkgIndexFile *>::iterator FileIterator;

 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
 bool IsDuplicateDescription(pkgCache::DescIterator Desc,
                            MD5SumValue const &CurMd5, std::string const &CurLang);
 
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
 bool IsDuplicateDescription(pkgCache::DescIterator Desc,
                            MD5SumValue const &CurMd5, std::string const &CurLang);
 

+using std::string;
+

 // CacheGenerator::pkgCacheGenerator - Constructor                     /*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */
 // CacheGenerator::pkgCacheGenerator - Constructor                     /*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */


@@ -1221,14 +1223,14 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
                        MMap **OutMap,bool AllowMem)
 {
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
                        MMap **OutMap,bool AllowMem)
 {
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);

-   
-   vector<pkgIndexFile *> Files;
-   for (vector<metaIndex *>::const_iterator i = List.begin();
+
+   std::vector<pkgIndexFile *> Files;
+   for (std::vector<metaIndex *>::const_iterator i = List.begin();

         i != List.end();
         ++i)
    {
         i != List.end();
         ++i)
    {

-      vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
+      std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin();

           j != Indexes->end();
           ++j)
          Files.push_back (*j);
           j != Indexes->end();
           ++j)
          Files.push_back (*j);


@@ -1418,7 +1420,7 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {

-   vector<pkgIndexFile *> Files;
+   std::vector<pkgIndexFile *> Files;

    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 03e29ec345f16dbd91b5095591faed70acd9cf67..02e27101a64a123443eda5977415825c30e9c019 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -59,11 +59,11 @@ class pkgSourceList
       const char *Name;
       const char *Label;
 
       const char *Name;
       const char *Label;
 

-      bool FixupURI(string &URI) const;
+      bool FixupURI(std::string &URI) const;

       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                             unsigned long const &CurLine,std::string const &File) const;
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                             unsigned long const &CurLine,std::string const &File) const;

-      virtual bool CreateItem(vector<metaIndex *> &List,std::string const &URI,
+      virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,

                              std::string const &Dist,std::string const &Section,
                              std::map<std::string, std::string> const &Options) const = 0;
       Type();
                              std::string const &Dist,std::string const &Section,
                              std::map<std::string, std::string> const &Options) const = 0;
       Type();

diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index f6d2d515802299a44d4d94d3b83f5fa5c817f1e3..48b643eace605c009781050125fdb965ed0a3891 100644 (file)
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -29,8 +29,8 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
 {
    for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I)
    {
 {
    for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I)
    {

-      vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+      std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin();

           J != Indexes->end(); ++J)
       {
          Parser* P = (*J)->CreateSrcParser();
           J != Indexes->end(); ++J)
       {
          Parser* P = (*J)->CreateSrcParser();


@@ -58,7 +58,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
 pkgSrcRecords::~pkgSrcRecords()
 {
    // Blow away all the parser objects
 pkgSrcRecords::~pkgSrcRecords()
 {
    // Blow away all the parser objects

-   for(vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
+   for(std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)

       delete *I;
 }
                                                                        /*}}}*/
       delete *I;
 }
                                                                        /*}}}*/


@@ -68,7 +68,7 @@ pkgSrcRecords::~pkgSrcRecords()
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();

-   for (vector<Parser*>::iterator I = Files.begin();
+   for (std::vector<Parser*>::iterator I = Files.begin();

         I != Files.end(); ++I)
       (*I)->Restart();
    
         I != Files.end(); ++I)
       (*I)->Restart();
    

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 256911231c1bac1c7136084265d0ac3963662a6f..4798fe3f53d487c4f18e065d0f7eb4fc05cc7fa1 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -44,3 +44,5 @@
 
 /* The package name string */
 #undef PACKAGE
 
 /* The package name string */
 #undef PACKAGE

+
+#define APT_8_CLEANER_HEADERS

diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index d0f90d3f490fbac49cf827caf8169723bcf4d74a..6d07a09c20e50d684e4d04dc923e930607b4a3d7 100644 (file)
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -14,6 +14,8 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 

+#include <string>
+

 class DebFile : public pkgDirStream
 {
        FileFd File;
 class DebFile : public pkgDirStream
 {
        FileFd File;


@@ -31,11 +33,11 @@ public:
        bool Go();
        bool ParseInfo();
 
        bool Go();
        bool ParseInfo();
 

-       static string GetInstalledVer(const string &package);
+       static std::string GetInstalledVer(const std::string &package);

 
 

-       string Package;
-       string Version;
-       string DepVer, PreDepVer;
+       std::string Package;
+       std::string Version;
+       std::string DepVer, PreDepVer;

        unsigned int DepOp, PreDepOp;
 
        char *Config;
        unsigned int DepOp, PreDepOp;
 
        char *Config;