Przeglądaj źródła

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

Michael Vogt 12 lat temu
rodzic
commit
55e3b9e3dd
2 zmienionych plików z 1 dodań i 9 usunięć
  1. 1 5
      apt-pkg/deb/debmetaindex.h
  2. 0 4
      apt-pkg/metaindex.h

+ 1 - 5
apt-pkg/deb/debmetaindex.h

@@ -41,15 +41,11 @@ class debReleaseIndex : public metaIndex {
    std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
    std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
    std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") 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 MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexFile(const char *Types) const;
    std::string MetaIndexURI(const char *Type) 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;
    virtual std::string LocalFileName() const;
 #endif
 #endif
 
 

+ 0 - 4
apt-pkg/metaindex.h

@@ -36,10 +36,6 @@ class metaIndex
 
 
    // interface to to query it
    // interface to to query it
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
 #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)
    // returns the path of the local file (or "" if its not available)
    virtual std::string LocalFileName() const {return "";};
    virtual std::string LocalFileName() const {return "";};
 #endif
 #endif