G++3 fixes from Randolph

Author: jgg
Date: 2001-05-07 04:24:08 GMT
G++3 fixes from Randolph

7 files changed, 24 insertions, 8 deletions

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index beae1e7d..be91eb45 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: indexfile.h,v 1.4 2001/04/29 05:13:51 jgg Exp $
+// $Id: indexfile.h,v 1.5 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.
@@ -30,6 +30,8 @@
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
     
+using std::string;
+
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index cc301cd3..ba84c5ed 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: packagemanager.h,v 1.13 2001/04/06 05:31:01 jgg Exp $
+// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -30,6 +30,8 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
+using std::string;
+
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index f2b1c39f..0d62c647 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: pkgcache.h,v 1.23 2001/02/20 07:03:17 jgg Exp $
+// $Id: pkgcache.h,v 1.24 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
    
    Cache - Structure definitions for the cache file
@@ -26,6 +26,8 @@
 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
+
+using std::string;
     
 class pkgVersioningSystem;
 class pkgCache
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 149782b2..15f20479 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: policy.h,v 1.3 2001/04/29 05:13:51 jgg Exp $
+// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Package Version Policy implementation
@@ -41,6 +41,8 @@
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 
+using std::vector;
+
 class pkgPolicy : public pkgDepCache::Policy
 {
    struct Pin
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 1dc50542..8e0cb7aa 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: sourcelist.h,v 1.10 2001/03/13 06:51:46 jgg Exp $
+// $Id: sourcelist.h,v 1.11 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    SourceList - Manage a list of sources
@@ -31,6 +31,9 @@
 #include <vector>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/indexfile.h>
+
+using std::string;
+using std::vector;
     
 #ifdef __GNUG__
 #pragma interface "apt-pkg/sourcelist.h"
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a73499ae..f63d0934 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: srcrecords.h,v 1.6 2001/02/20 07:03:17 jgg Exp $
+// $Id: srcrecords.h,v 1.7 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
    
    Source Package Records - Allows access to source package records
@@ -20,6 +20,9 @@
 #include <string>
 #include <vector>    
 
+using std::string;
+using std::vector;
+
 class pkgSourceList;
 class pkgIndexFile;
 class pkgSrcRecords
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index f8f236a2..878b3eb6 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: versionmatch.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: versionmatch.h,v 1.3 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Version Matching 
@@ -38,8 +38,10 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
+using std::string;
+
 class pkgVersionMatch
-{
+{   
    // Version Matching
    string VerStr;
    bool VerPrefixMatch;