diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 11:21:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 11:24:16 +0200 |
| commit | 8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b (patch) | |
| tree | 000fce642c5c12f3cc8b5472bcd03994c78b5050 /apt-private/private-output.h | |
| parent | 17091f2f33de16c2dae501e7868f7aec4fc3452f (diff) | |
| parent | 82ced5c894cd013721f432ae8da66114155e04c7 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
Conflicts:
apt-private/private-install.cc
Diffstat (limited to 'apt-private/private-output.h')
| -rw-r--r-- | apt-private/private-output.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-private/private-output.h b/apt-private/private-output.h index 9633d0c37..6f3a964d7 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -28,7 +28,8 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, // helper to describe global state -APT_PUBLIC void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now); +APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now); +APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now); APT_PUBLIC bool ShowList(std::ostream &out, std::string Title, std::string List, std::string VersionsList); |