Bug#166322: apt: Patch to compile apt with gcc 3.2 (Part 2)
Package: apt
Version: 0.5.4
Severity: important
Tags: patch
Here is the second part needed to get apt compled with gcc 3.2.
Index: apt-pkg/acquire-method.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/acquire-method.cc,v
retrieving revision 1.27
diff -u -r1.27 acquire-method.cc
--- apt-pkg/acquire-method.cc 22 May 2001 04:27:11 -0000 1.27
+++ apt-pkg/acquire-method.cc 25 Oct 2002 13:20:58 -0000
@@ -238,7 +238,7 @@
if (write(STDOUT_FILENO,S,strlen(S)) !=3D (signed)strlen(S))
exit(100);
=
- vector<string> MyMessages;
+ std::vector<string> MyMessages;
=
/* Here we read messages until we find a 603, each non 603 message is
appended to the main message list for later processing */
Index: apt-pkg/acquire-method.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/acquire-method.h,v
retrieving revision 1.15
diff -u -r1.15 acquire-method.h
--- apt-pkg/acquire-method.h 13 Mar 2001 06:51:46 -0000 1.15
+++ apt-pkg/acquire-method.h 25 Oct 2002 13:20:58 -0000
@@ -50,7 +50,7 @@
};
=
// State
- vector<string> Messages;
+ std::vector<string> Messages;
FetchItem *Queue;
FetchItem *QueueBack;
string FailExtra;
Index: apt-pkg/acquire-worker.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/acquire-worker.h,v
retrieving revision 1.12
diff -u -r1.12 acquire-worker.h
--- apt-pkg/acquire-worker.h 20 Feb 2001 07:03:17 -0000 1.12
+++ apt-pkg/acquire-worker.h 25 Oct 2002 13:20:58 -0000
@@ -46,7 +46,7 @@
=
// Various internal things
bool Debug;
- vector<string> MessageQueue;
+ std::vector<string> MessageQueue;
string OutQueue;
=
// Private constructor helper
Index: apt-pkg/acquire.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/acquire.h,v
retrieving revision 1.29
diff -u -r1.29 acquire.h
--- apt-pkg/acquire.h 22 May 2001 04:17:18 -0000 1.29
+++ apt-pkg/acquire.h 25 Oct 2002 13:20:58 -0000
@@ -58,13 +58,13 @@
friend class Item;
friend class Queue;
=
- typedef vector<Item *>::iterator ItemIterator;
- typedef vector<Item *>::const_iterator ItemCIterator;
+ typedef std::vector<Item *>::iterator ItemIterator;
+ typedef std::vector<Item *>::const_iterator ItemCIterator;
=
protected:
=
// List of items to fetch
- vector<Item *> Items;
+ std::vector<Item *> Items;
=
// List of active queues and fetched method configuration parameters
Queue *Queues;
Index: apt-pkg/pkgcachegen.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/pkgcachegen.cc,v
retrieving revision 1.52
diff -u -r1.52 pkgcachegen.cc
--- apt-pkg/pkgcachegen.cc 8 Jul 2002 03:13:30 -0000 1.52
+++ apt-pkg/pkgcachegen.cc 25 Oct 2002 13:20:58 -0000
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <system.h>
/*}}}*/
-typedef vector<pkgIndexFile *>::iterator FileIterator;
+typedef std::vector<pkgIndexFile *>::iterator FileIterator;
=
// CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/
// ---------------------------------------------------------------------
@@ -678,7 +678,7 @@
{
unsigned long MapSize =3D _config->FindI("APT::Cache-Limit",6*1024*1024=
);
=
- vector<pkgIndexFile *> Files(List.begin(),List.end());
+ std::vector<pkgIndexFile *> Files(List.begin(),List.end());
unsigned long EndOfSource =3D Files.size();
if (_system->AddStatusFiles(Files) =3D=3D false)
return false;
@@ -813,7 +813,7 @@
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
{
unsigned long MapSize =3D _config->FindI("APT::Cache-Limit",4*1024*1024=
);
- vector<pkgIndexFile *> Files;
+ std::vector<pkgIndexFile *> Files;
unsigned long EndOfSource =3D Files.size();
if (_system->AddStatusFiles(Files) =3D=3D false)
return false;
Index: apt-pkg/pkgsystem.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/pkgsystem.h,v
retrieving revision 1.5
diff -u -r1.5 pkgsystem.h
--- apt-pkg/pkgsystem.h 26 Mar 2002 07:38:58 -0000 1.5
+++ apt-pkg/pkgsystem.h 25 Oct 2002 13:20:58 -0000
@@ -79,7 +79,7 @@
virtual bool ArchiveSupported(const char *Type) =3D 0;
=
// Return a list of system index files..
- virtual bool AddStatusFiles(vector<pkgIndexFile *> &List) =3D 0; =
+ virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) =3D 0; =
virtual bool FindIndex(pkgCache::PkgFileIterator File,
pkgIndexFile *&Found) const =3D 0;
=
Index: apt-pkg/policy.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/policy.cc,v
retrieving revision 1.8
diff -u -r1.8 policy.cc
--- apt-pkg/policy.cc 27 May 2001 23:40:56 -0000 1.8
+++ apt-pkg/policy.cc 25 Oct 2002 13:20:58 -0000
@@ -81,7 +81,7 @@
memset(Fixed,0,sizeof(*Fixed)*Cache->HeaderP->PackageFileCount);
signed Cur =3D 989;
StatusOverride =3D false;
- for (vector<Pin>::const_iterator I =3D Defaults.begin(); I !=3D Default=
s.end();
+ for (std::vector<Pin>::const_iterator I =3D Defaults.begin(); I !=3D De=
faults.end();
I++, Cur--)
{
pkgVersionMatch Match(I->Data,I->Type);
@@ -191,7 +191,7 @@
if (Pkg.end() =3D=3D true)
{
// Check the unmatched table
- for (vector<PkgPin>::iterator I =3D Unmatched.begin(); =
+ for (std::vector<PkgPin>::iterator I =3D Unmatched.begin(); =
I !=3D Unmatched.end() && P =3D=3D 0; I++)
if (I->Pkg =3D=3D Name)
P =3D &*I;
Index: apt-pkg/policy.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/policy.h,v
retrieving revision 1.4
diff -u -r1.4 policy.h
--- apt-pkg/policy.h 7 May 2001 04:24:08 -0000 1.4
+++ apt-pkg/policy.h 25 Oct 2002 13:20:58 -0000
@@ -62,8 +62,8 @@
=
Pin *Pins;
signed short *PFPriority;
- vector<Pin> Defaults;
- vector<PkgPin> Unmatched;
+ std::vector<Pin> Defaults;
+ std::vector<PkgPin> Unmatched;
pkgCache *Cache;
bool StatusOverride;
=
Index: apt-pkg/sourcelist.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/sourcelist.cc,v
retrieving revision 1.24
diff -u -r1.24 sourcelist.cc
--- apt-pkg/sourcelist.cc 8 Jul 2002 04:18:07 -0000 1.24
+++ apt-pkg/sourcelist.cc 25 Oct 2002 13:20:58 -0000
@@ -74,7 +74,7 @@
// ---------------------------------------------------------------------
/* This is a generic one that is the 'usual' format for sources.list
Weird types may override this. */
-bool pkgSourceList::Type::ParseLine(vector<pkgIndexFile *> &List,
+bool pkgSourceList::Type::ParseLine(std::vector<pkgIndexFile *> &List,
Vendor const *Vendor,
const char *Buffer,
unsigned long CurLine,
@@ -135,7 +135,7 @@
{
for (const_iterator I =3D SrcList.begin(); I !=3D SrcList.end(); I++)
delete *I;
- for (vector<Vendor const *>::const_iterator I =3D VendorList.begin(); =
+ for (std::vector<Vendor const *>::const_iterator I =3D VendorList.begin=
(); =
I !=3D VendorList.end(); I++)
delete *I;
}
@@ -159,7 +159,7 @@
if (ReadConfigFile(Cnf,CnfFile,true) =3D=3D false)
return false;
=
- for (vector<Vendor const *>::const_iterator I =3D VendorList.begin(); =
+ for (std::vector<Vendor const *>::const_iterator I =3D VendorList.begin=
(); =
I !=3D VendorList.end(); I++)
delete *I;
VendorList.erase(VendorList.begin(),VendorList.end());
@@ -282,7 +282,7 @@
return _error->Error(_("Malformed line %u in source list %s (vendor =
id)"),CurLine,File.c_str());
VendorID =3D string(VendorID,1,VendorID.size()-2);
=
- for (vector<Vendor const *>::const_iterator iter =3D VendorList.begin();
+ for (std::vector<Vendor const *>::const_iterator iter =3D VendorList.beg=
in();
iter !=3D VendorList.end(); iter++) =
{
if ((*iter)->VendorID =3D=3D VendorID)
Index: apt-pkg/sourcelist.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/sourcelist.h,v
retrieving revision 1.12
diff -u -r1.12 sourcelist.h
--- apt-pkg/sourcelist.h 1 Jul 2002 21:41:11 -0000 1.12
+++ apt-pkg/sourcelist.h 25 Oct 2002 13:20:59 -0000
@@ -32,9 +32,6 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/indexfile.h>
=
-using std::string;
-using std::vector;
- =
#ifdef __GNUG__
#pragma interface "apt-pkg/sourcelist.h"
#endif
@@ -70,11 +67,11 @@
const char *Label;
=
bool FixupURI(string &URI) const;
- virtual bool ParseLine(vector<pkgIndexFile *> &List,
+ virtual bool ParseLine(std::vector<pkgIndexFile *> &List,
Vendor const *Vendor,
const char *Buffer,
unsigned long CurLine,string File) const;
- virtual bool CreateItem(vector<pkgIndexFile *> &List,string URI,
+ virtual bool CreateItem(std::vector<pkgIndexFile *> &List,string URI,
string Dist,string Section,
Vendor const *Vendor) const =3D 0;
=
@@ -82,12 +79,12 @@
virtual ~Type() {};
};
=
- typedef vector<pkgIndexFile *>::const_iterator const_iterator;
+ typedef std::vector<pkgIndexFile *>::const_iterator const_iterator;
=
protected:
=
- vector<pkgIndexFile *> SrcList;
- vector<Vendor const *> VendorList;
+ std::vector<pkgIndexFile *> SrcList;
+ std::vector<Vendor const *> VendorList;
=
public:
=
Index: apt-pkg/srcrecords.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/srcrecords.h,v
retrieving revision 1.8
diff -u -r1.8 srcrecords.h
--- apt-pkg/srcrecords.h 4 Nov 2001 17:09:18 -0000 1.8
+++ apt-pkg/srcrecords.h 25 Oct 2002 13:20:59 -0000
@@ -72,10 +72,10 @@
virtual string Section() const =3D 0;
virtual const char **Binaries() =3D 0; // Ownership does not trans=
fer
=
- virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchO=
nly) =3D 0;
+ virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool =
ArchOnly) =3D 0;
static const char *BuildDepType(unsigned char Type);
=
- virtual bool Files(vector<pkgSrcRecords::File> &F) =3D 0;
+ virtual bool Files(std::vector<pkgSrcRecords::File> &F) =3D 0;
=
Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {};
Index: apt-pkg/deb/debsystem.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/deity/apt/apt-pkg/deb/debsystem.cc,v
retrieving revision 1.3
diff -u -r1.3 debsystem.cc
--- apt-pkg/deb/debsystem.cc 29 Apr 2001 05:13:51 -0000 1.3
+++ apt-pkg/deb/debsystem.cc 25 Oct 2002 13:20:59 -0000
@@ -197,7 +197,7 @@
// System::AddStatusFiles - Register the status files /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool debSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
{
if (StatusFile =3D=3D 0)
StatusFile =3D new debStatusIndex(_config->FindFile("Dir::State::sta=
tus"));
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux asterix 2.4.19-k7 #1 Sun Oct 6 20:29:56 EST 2002 i686
Locale: LANG=3Dde_DE@euro, LC_CTYPE=3Dde_DE@euro (ignored: LC_ALL set)
Versions of packages apt depends on:
ii libc6 2.3.1-3 GNU C Library: Shared librarie=
s an
ii libstdc++2.10-glibc2.2 1:2.95.4-12 The GNU stdc++ library
-- no debconf information
Reply to: