Merge branch 'debian/sid' into feature/apt-manpage

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

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 9f488898db1b82117549cc6e0ac7de2a2c3e26b4..cef8d68f751e8199ddb782fa0b9df48514e30fcb 100644 (file)
--- 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