summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-06-29 11:00:04 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-06-29 12:23:02 +0200
commitcfc6566d5097ef5518e12f5c1e5f15a8f5b182cf (patch)
tree164765f75084820a06e1d19a757d383ec9d6a0bf /apt-pkg/deb
parent42610b9d5a95ec108b74ffbc6446542cf6b0176a (diff)
Revert "travis: use gcc-5 instead of gcc(-4.8)"
This reverts commit 2b8221d66a8284042fc53c7bbb14bb9750e9137f. Avoiding the use of GCC >= 5 stuff lets use go back to 4.8 simplifying the travis setup again as well as reducing the backport requirements in general. This is possible because the std::get_time use requiring GCC >= 5 in 9febc2b238e1e322dce1f94ecbed46d595893b52 was replaced by handrolling it in 1d742e01470bba27715a8191c50adde4b39c2f19, so the remaining uses are just small conviniences we can do without. Gbp-Dch: Ignore
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index d8e838882..5e27c2686 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1233,9 +1233,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
if (notconfidx != std::numeric_limits<decltype(notconfidx)>::max())
{
if (ConfigurePending)
- List.erase(std::next(List.cbegin(), notconfidx), std::prev(List.cend()));
+ List.erase(std::next(List.begin(), notconfidx), std::prev(List.end()));
else
- List.erase(std::next(List.cbegin(), notconfidx), List.cend());
+ List.erase(std::next(List.begin(), notconfidx), List.end());
}
d->stdin_is_dev_null = false;