diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
| commit | 6f2f5f4afa6f628ad3d068e9ba55fc6455eefa12 (patch) | |
| tree | d360bbbdff678c19142facabc46f30f693fe32e9 /apt-pkg/cacheset.h | |
| parent | 1f5a2d63b784eb919143d0be3f2dee7ff0bb7e83 (diff) | |
| parent | 56e47f3111ad714c6506c0d60dccb92cfc9311cb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'apt-pkg/cacheset.h')
| -rw-r--r-- | apt-pkg/cacheset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index b7229bc04..b1302c608 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -53,7 +53,7 @@ public: /*{{{*/ virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) virtual void showFnmatchSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); #endif virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, @@ -61,7 +61,7 @@ public: /*{{{*/ virtual void canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); virtual void canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) virtual void canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); #endif virtual void canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str); |