diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 19:14:19 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 19:14:19 +0200 |
| commit | 472ff00ef2e48383805d281c6364ec27839e3f4d (patch) | |
| tree | 6f81e83690167fc78f3bbd3dcf03cf83cdcc60f6 /apt-pkg/cacheset.cc | |
| parent | 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 (diff) | |
use forward declaration in headers if possible instead of includes
Diffstat (limited to 'apt-pkg/cacheset.cc')
| -rw-r--r-- | apt-pkg/cacheset.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 386ecfb5f..6b95eab70 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -12,11 +12,14 @@ #include <config.h> #include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/cachefile.h> #include <apt-pkg/cachefilter.h> #include <apt-pkg/cacheset.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/versionmatch.h> +#include <apt-pkg/pkgrecords.h> +#include <apt-pkg/policy.h> #include <vector> @@ -298,7 +301,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { + if (vertag != std::string::npos) { ver = pkg.substr(vertag+1); verIsRel = (pkg[vertag] == '/'); pkg.erase(vertag); @@ -316,7 +319,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, errors = helper.showErrors(false); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { - if (vertag == string::npos) { + if (vertag == std::string::npos) { verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; } |