G++3 fixes from Randolph

Author: jgg
Date: 2001-05-07 05:05:13 GMT
G++3 fixes from Randolph

10 files changed, 31 insertions, 11 deletions

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 309857dde..3180a03c7 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: cdromutl.h,v 1.2 1999/06/05 03:54:29 jgg Exp $
+// $Id: cdromutl.h,v 1.3 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 
    CDROM Utilities - Some functions to manipulate CDROM mounts.
@@ -12,6 +12,8 @@
 
 #include <string>
 
+using std::string;
+
 #ifdef __GNUG__
 #pragma interface "apt-pkg/cdromutl.h"
 #endif 
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 84a8cf07e..bc2b0fd15 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: configuration.h,v 1.13 2001/03/11 07:22:19 jgg Exp $
+// $Id: configuration.h,v 1.14 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -34,6 +34,8 @@
 
 #include <string>
 
+using std::string;
+
 class Configuration
 {
    public:
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 0dc57927a..a5fc1a223 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: error.h,v 1.7 2001/02/20 07:03:17 jgg Exp $
+// $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -55,6 +55,8 @@
     
 #include <string>
 
+using std::string;
+
 class GlobalError
 {
    struct Item
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 8d5f03b05..b6b9cae83 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.h,v 1.25 2001/04/22 05:42:53 jgg Exp $
+// $Id: fileutl.h,v 1.26 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -27,6 +27,8 @@
 
 #include <string>
 
+using std::string;
+
 class FileFd
 {
    protected:
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 8b809729b..47c6a7cec 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: md5.h,v 1.5 2001/02/20 07:03:17 jgg Exp $
+// $Id: md5.h,v 1.6 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
    MD5SumValue - Storage for a MD5Sum
@@ -29,6 +29,8 @@
 
 #include <string>
 
+using std::string;
+
 class MD5Summation;
 
 class MD5SumValue
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index f09545156..d0b1f5f94 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: progress.h,v 1.5 1999/01/18 06:20:08 jgg Exp $
+// $Id: progress.h,v 1.6 2001/05/07 05:06:52 jgg Exp $
 /* ######################################################################
    
    OpProgress - Operation Progress
@@ -28,6 +28,8 @@
 #include <string>
 #include <sys/time.h>
 
+using std::string;
+
 class Configuration;
 class OpProgress
 {
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 89c8a1ec0..7d25ceb0d 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: sha1.h,v 1.2 2001/04/25 07:30:13 tausq Exp $
+// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
 /* ######################################################################
 
    SHA1SumValue - Storage for a SHA-1 hash.
@@ -20,6 +20,8 @@
 
 #include <string>
 
+using std::string;
+
 class SHA1Summation;
 
 class SHA1SumValue
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index e7c42fd11..17281425b 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: debversion.cc,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: debversion.cc,v 1.3 2001/05/07 05:14:53 jgg Exp $
 /* ######################################################################
 
    Debian Version - Versioning system for Debian
@@ -19,6 +19,7 @@
 #include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>
+#include <ctype.h>
 									/*}}}*/
 
 debVersioningSystem debVS;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index ae761ec4d..5ba1325c3 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dpkgpm.cc,v 1.19 2001/02/22 06:26:27 jgg Exp $
+// $Id: dpkgpm.cc,v 1.20 2001/05/07 05:14:24 jgg Exp $
 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg
@@ -16,7 +16,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/strutl.h>
-    
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -25,6 +25,9 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdio.h>
+#include <iostream>
+
+using namespace std;
 									/*}}}*/
 
 // DPkgPM::pkgDPkgPM - Constructor					/*{{{*/
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 761aac76b..5d60b32d2 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dpkgpm.h,v 1.7 2001/02/20 07:03:17 jgg Exp $
+// $Id: dpkgpm.h,v 1.8 2001/05/07 05:05:13 jgg Exp $
 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg
@@ -18,6 +18,8 @@
 #include <vector>
 #include <stdio.h>
 
+using std::vector;
+
 class pkgDPkgPM : public pkgPackageManager
 {
    protected: