summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-03-07 02:05:29 +0100
committerJulian Andres Klode <jak@debian.org>2016-03-07 02:06:15 +0100
commit950f68a3459f47aa7215ce2bd493ca9354194300 (patch)
treeb039bf21a7ea8d3875cbf373729fec1abec4f9aa /apt-pkg
parent2f34b45174906024fa87ee0d51d2e13d4770f465 (diff)
Backport the fix from the last commit to C++98
I should have tested this before pushing it to git.debian.org, but accidentally did not. Gbp-Dch: ignore
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 4fbeefd4a..864a0a7cb 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -991,7 +991,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
if (Debug == true)
clog << " Added " << Pkg.FullName(false) << " to the remove list" << endl;
- KillList.push_back({Pkg, End});
+ KillList.push_back((PackageKill) {Pkg, End});
if (Start.IsNegative() == false)
break;
@@ -1041,7 +1041,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
// Apply the kill list now
if (Cache[I].InstallVer != 0)
{
- for (auto J = KillList.begin(); J != KillList.end(); J++)
+ for (std::vector<PackageKill>::const_iterator J = KillList.begin(); J != KillList.end(); J++)
{
Change = true;
if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0)