diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
| commit | 1b4560fec66a6e7b2dff9aaa19095fb8423f69a0 (patch) | |
| tree | 7fb2b63e31f356ef87af4699ba87b4f1443f508c /apt-pkg/indexfile.h | |
| parent | 81d183681aea972fddd453d62109f8ccda3f447a (diff) | |
| parent | 74d4bb26e09146b9d5f01889a676dc58ff5d63cd (diff) | |
Merge branch 'debian/sid' into feature/apt-manpage
Diffstat (limited to 'apt-pkg/indexfile.h')
| -rw-r--r-- | apt-pkg/indexfile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 1d34dc773..2d433b60a 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -78,10 +78,10 @@ class pkgIndexFile virtual bool Exists() const = 0; virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; - virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; }; + virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* Prog) const { return false; }; __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const { return Merge(Gen, &Prog); }; - virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; + virtual bool MergeFileProvides(pkgCacheGenerator &Gen,OpProgress* Prog) const {return true;}; __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; |