diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:05 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:05 +0000 |
| commit | 076d01b04c20200fc72fc22de41c4872af484650 (patch) | |
| tree | 69b1cf0aefd04868fb193132a2623fea137528f7 /cmdline/apt-get.cc | |
| parent | 43b3b6267f24ef28f74f9b16999844fb9809e72b (diff) | |
G++3 fixes from Randolph
Author: jgg
Date: 2001-05-27 04:45:49 GMT
G++3 fixes from Randolph
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1e3a94663..70e86f219 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.106 2001/04/28 01:18:37 doogie Exp $ +// $Id: apt-get.cc,v 1.107 2001/05/27 04:45:49 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -58,9 +58,11 @@ #include <sys/wait.h> /*}}}*/ -ostream c0out; -ostream c1out; -ostream c2out; +using namespace std; + +ostream c0out(0); +ostream c1out(0); +ostream c2out(0); ofstream devnull("/dev/null"); unsigned int ScreenWidth = 80; @@ -766,7 +768,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, bool Transient = false; if (_config->FindB("APT::Get::Download",true) == false) { - for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd();) + for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd();) { if ((*I)->Local == true) { @@ -790,7 +792,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // Print out errors bool Failed = false; - for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) { if ((*I)->Status == pkgAcquire::Item::StatDone && (*I)->Complete == true) @@ -1149,7 +1151,7 @@ bool DoUpdate(CommandLine &CmdL) return false; bool Failed = false; - for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) { if ((*I)->Status == pkgAcquire::Item::StatDone) continue; @@ -1694,7 +1696,7 @@ bool DoSource(CommandLine &CmdL) // Print error messages bool Failed = false; - for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) { if ((*I)->Status == pkgAcquire::Item::StatDone && (*I)->Complete == true) |