diff options
| -rw-r--r-- | apt-pkg/deb/debmetaindex.h | 6 | ||||
| -rw-r--r-- | apt-pkg/metaindex.h | 4 |
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 |