From: Michael Vogt <mvo@debian.org>
Date: Thu, 5 Dec 2013 07:06:06 +0000 (+0100)
Subject: remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package... 
X-Git-Tag: 0.9.14.1~3^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/55e3b9e3ddc2a59df06e22be4efff7f72406d4ec?hp=--cc

remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package system specific
---

55e3b9e3ddc2a59df06e22be4efff7f72406d4ec
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 9f488898d..cef8d68f7 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -41,15 +41,11 @@ class debReleaseIndex : public metaIndex {
    std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
    std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
 
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) const;
-#else
-   virtual std::string MetaIndexInfo(const char *Type) const;
-   virtual std::string MetaIndexFile(const char *Types) const;
-   virtual std::string MetaIndexURI(const char *Type) const;
 
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual std::string LocalFileName() const;
 #endif
 
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 147154227..18a90a29d 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -36,10 +36,6 @@ class metaIndex
 
    // interface to to query it
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   virtual std::string MetaIndexInfo(const char *Type) const {return "";};
-   virtual std::string MetaIndexFile(const char *Types) const {return "";};
-   virtual std::string MetaIndexURI(const char *Type) const {return "";};
-
    // returns the path of the local file (or "" if its not available)
    virtual std::string LocalFileName() const {return "";};
 #endif