From 304731b8f23e03d15d1c2d6f66e1bf5f26ac0ca2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 17 Aug 2013 10:11:40 +0200 Subject: [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines --- apt-private/private-list.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'apt-private/private-list.cc') 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); } } -- cgit v1.2.3