diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
| commit | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch) | |
| tree | 3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /apt-pkg/indexfile.h | |
| parent | b10b0c4aac5d0648125d4203eea6900032efb7ba (diff) | |
| parent | 7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
debian/control
doc/apt-key.8.xml
doc/makefile
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
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; |