rework dpkg-wrapping in test framework

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

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 3995439536f109e079100a17a05bde99a44ad88c..94d00576034a2d91736f8ae9fd107f2252cc3383 100644 (file)
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -21,7 +21,7 @@ class pkgIndexFile;
 class debDebPkgFileIndex;
 class IndexTarget;
 
 class debDebPkgFileIndex;
 class IndexTarget;
 

-class debReleaseIndex : public metaIndex {
+class APT_HIDDEN debReleaseIndex : public metaIndex {

    public:
 
    class debSectionEntry
    public:
 
    class debSectionEntry


@@ -53,9 +53,10 @@ class debReleaseIndex : public metaIndex {
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) const;
 
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) const;
 

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual std::string LocalFileName() const;
+#if APT_PKG_ABI >= 413
+   virtual

 #endif
 #endif

+   std::string LocalFileName() const;

 
    std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
    std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;
 
    std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
    std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;


@@ -73,7 +74,7 @@ class debReleaseIndex : public metaIndex {
    void PushSectionEntry(const debSectionEntry *Entry);
 };
 
    void PushSectionEntry(const debSectionEntry *Entry);
 };
 

-class debDebFileMetaIndex : public metaIndex
+class APT_HIDDEN debDebFileMetaIndex : public metaIndex

 {
  private:
    std::string DebFile;
 {
  private:
    std::string DebFile;