From 55e3b9e3ddc2a59df06e22be4efff7f72406d4ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Dec 2013 08:06:06 +0100 Subject: [PATCH] remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package system specific --- apt-pkg/deb/debmetaindex.h | 6 +----- apt-pkg/metaindex.h | 4 ---- 2 files changed, 1 insertion(+), 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 * 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 -- 2.45.2