X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c9443c01208377f0cba9706412ea3a98ad97b56d..af9e40c9bfb353b8aea1e2621b3b5a8c1c1db4bd:/apt-pkg/pkgcachegen.h?ds=sidebyside diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 15e73627d..46fccdaa5 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -74,9 +74,6 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/ std::string PkgFileName; pkgCache::PackageFile *CurrentFile; - // Flag file dependencies - bool FoundFileDeps; - bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name); bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); @@ -104,15 +101,11 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/ bool SelectReleaseFile(const std::string &File, const std::string &Site, unsigned long Flags = 0); bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0); inline pkgCache &GetCache() {return Cache;}; - inline pkgCache::PkgFileIterator GetCurFile() + inline pkgCache::PkgFileIterator GetCurFile() {return pkgCache::PkgFileIterator(Cache,CurrentFile);}; - inline pkgCache::RlsFileIterator GetCurRlsFile() + inline pkgCache::RlsFileIterator GetCurRlsFile() {return pkgCache::RlsFileIterator(Cache,CurrentRlsFile);}; - bool HasFileDeps() {return FoundFileDeps;}; - bool MergeFileProvides(ListParser &List); - bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST; - APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap = 0,bool AllowMem = false); APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); @@ -142,15 +135,11 @@ class APT_HIDDEN pkgCacheListParser { pkgCacheGenerator *Owner; friend class pkgCacheGenerator; - template using Dynamic = pkgCacheGenerator::Dynamic; // Some cache items pkgCache::VerIterator OldDepVer; map_pointer_t *OldDepLast; - // Flag file dependencies - bool FoundFileDeps; - void * const d; protected: @@ -194,7 +183,6 @@ class APT_HIDDEN pkgCacheListParser virtual bool Step() = 0; - inline bool HasFileDeps() {return FoundFileDeps;}; virtual bool CollectFileProvides(pkgCache &/*Cache*/, pkgCache::VerIterator &/*Ver*/) {return true;};