summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-05 08:06:06 +0100
committerMichael Vogt <mvo@debian.org>2013-12-05 08:06:28 +0100
commit55e3b9e3ddc2a59df06e22be4efff7f72406d4ec (patch)
tree8e272b2d8c0d0c663d3b8582cec60a88ff981505
parentd958636fdf39d8b1f08239f9981c8b6520bde7a6 (diff)
remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package system specific
-rw-r--r--apt-pkg/deb/debmetaindex.h6
-rw-r--r--apt-pkg/metaindex.h4
2 files changed, 1 insertions, 9 deletions
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