Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / debindexfile.h

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 18322dc1b1b3902750f38017a63073afcc988c65..e5a1a7873415d449b45be71af3cfb533f78f295c 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -52,7 +52,7 @@ class debStatusIndex : public pkgIndexFile
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debStatusIndex(std::string File);
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debStatusIndex(std::string File);

-   virtual ~debStatusIndex() {};
+   virtual ~debStatusIndex();

 };
     
 class debPackagesIndex : public pkgIndexFile
 };
     
 class debPackagesIndex : public pkgIndexFile


@@ -65,10 +65,10 @@ class debPackagesIndex : public pkgIndexFile
    std::string Section;
    std::string Architecture;
 
    std::string Section;
    std::string Architecture;
 

-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
-   
+   APT_HIDDEN std::string Info(const char *Type) const;
+   APT_HIDDEN std::string IndexFile(const char *Type) const;
+   APT_HIDDEN std::string IndexURI(const char *Type) const;
+

    public:
    
    virtual const Type *GetType() const APT_CONST;
    public:
    
    virtual const Type *GetType() const APT_CONST;


@@ -89,7 +89,7 @@ class debPackagesIndex : public pkgIndexFile
 
    debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
                        bool const &Trusted, std::string const &Arch = "native");
 
    debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
                        bool const &Trusted, std::string const &Arch = "native");

-   virtual ~debPackagesIndex() {};
+   virtual ~debPackagesIndex();

 };
 
 class debTranslationsIndex : public pkgIndexFile
 };
 
 class debTranslationsIndex : public pkgIndexFile


@@ -102,11 +102,11 @@ class debTranslationsIndex : public pkgIndexFile
    std::string Section;
    const char * const Language;
    
    std::string Section;
    const char * const Language;
    

-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
+   APT_HIDDEN std::string Info(const char *Type) const;
+   APT_HIDDEN std::string IndexFile(const char *Type) const;
+   APT_HIDDEN std::string IndexURI(const char *Type) const;

 
 

-   inline std::string TranslationFile() const {return std::string("Translation-").append(Language);};
+   APT_HIDDEN std::string TranslationFile() const {return std::string("Translation-").append(Language);};

 
    public:
    
 
    public:
    


@@ -124,7 +124,7 @@ class debTranslationsIndex : public pkgIndexFile
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
    debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);

-   virtual ~debTranslationsIndex() {};
+   virtual ~debTranslationsIndex();

 };
 
 class debSourcesIndex : public pkgIndexFile
 };
 
 class debSourcesIndex : public pkgIndexFile


@@ -136,10 +136,10 @@ class debSourcesIndex : public pkgIndexFile
    std::string Dist;
    std::string Section;
 
    std::string Dist;
    std::string Section;
 

-   std::string Info(const char *Type) const;
-   std::string IndexFile(const char *Type) const;
-   std::string IndexURI(const char *Type) const;
-   
+   APT_HIDDEN std::string Info(const char *Type) const;
+   APT_HIDDEN std::string IndexFile(const char *Type) const;
+   APT_HIDDEN std::string IndexURI(const char *Type) const;
+

    public:
 
    virtual const Type *GetType() const APT_CONST;
    public:
 
    virtual const Type *GetType() const APT_CONST;


@@ -161,7 +161,7 @@ class debSourcesIndex : public pkgIndexFile
    virtual unsigned long Size() const;
    
    debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);
    virtual unsigned long Size() const;
    
    debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);

-   virtual ~debSourcesIndex() {};
+   virtual ~debSourcesIndex();

 };
 
 class debDebPkgFileIndex : public pkgIndexFile
 };
 
 class debDebPkgFileIndex : public pkgIndexFile


@@ -191,8 +191,8 @@ class debDebPkgFileIndex : public pkgIndexFile
    virtual std::string ArchiveURI(std::string /*File*/) const;
 
    debDebPkgFileIndex(std::string DebFile);
    virtual std::string ArchiveURI(std::string /*File*/) const;
 
    debDebPkgFileIndex(std::string DebFile);

-   virtual ~debDebPkgFileIndex() {};
-};   
+   virtual ~debDebPkgFileIndex();
+};

 
 class debDscFileIndex : public pkgIndexFile
 {
 
 class debDscFileIndex : public pkgIndexFile
 {


@@ -214,6 +214,7 @@ class debDscFileIndex : public pkgIndexFile
 
 class debDebianSourceDirIndex : public debDscFileIndex
 {
 
 class debDebianSourceDirIndex : public debDscFileIndex
 {

+ public:

    virtual const Type *GetType() const APT_CONST;
 };
 
    virtual const Type *GetType() const APT_CONST;
 };