X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/1afd369d00f2f9272462ffc6c6e24f293a81459e..304731b8f23e03d15d1c2d6f66e1bf5f26ac0ca2:/apt-private/private-list.cc?ds=sidebyside diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index c3a21aafc..bbf4607f9 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -53,9 +53,6 @@ struct PackageSortAlphabetic } }; -#ifdef PACKAGE_MATCHER_ABI_COMPAT -#define PackageMatcher PackageNameMatchesFnmatch -#endif class PackageNameMatcher : public Matcher { public: @@ -64,16 +61,11 @@ class PackageNameMatcher : public Matcher for(int i=0; patterns[i] != NULL; i++) { std::string pattern = patterns[i]; -#ifdef PACKAGE_MATCHER_ABI_COMPAT - APT::CacheFilter::PackageNameMatchesFnmatch *cachefilter = NULL; - cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#else APT::CacheFilter::PackageMatcher *cachefilter = NULL; if(_config->FindB("APT::Cmd::UseRegexp", false) == true) cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern); else cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#endif filters.push_back(cachefilter); } }