diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-04 17:58:36 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-04 17:58:36 +0100 |
| commit | 916e5cb41edfa015fd8ec42ba140eb7c0c4cb511 (patch) | |
| tree | 351f7803644be7bac1a5458553e6d801850101bc /apt-pkg/deb | |
| parent | d85d0c09cee3aa5b84e45f46595f6dd617ce64b6 (diff) | |
add #ifdefed ABI break & cleaner solution once the abi break is in place
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index b597b6f3c..345b1ec11 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -1,4 +1,3 @@ -// ijones, walters #include <config.h> #include <apt-pkg/debmetaindex.h> @@ -36,6 +35,7 @@ string debReleaseIndex::Info(const char *Type, string const &Section, string con return Info; } +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) string debReleaseIndex::MetaIndexInfo(const char *Type) const { string Info = ::URI::SiteOnly(URI) + ' '; @@ -71,6 +71,7 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const Res += Type; return Res; } +#endif string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const { diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index b9ecab97c..fc0b7f948 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -3,6 +3,7 @@ #define PKGLIB_DEBMETAINDEX_H #include <apt-pkg/metaindex.h> +#include <apt-pkg/init.h> #include <map> #include <string> @@ -39,9 +40,13 @@ class debReleaseIndex : public metaIndex { virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const; 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; +#endif + std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const; std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const; std::string SourceIndexURI(const char *Type, const std::string &Section) const; |